feature 代码提交

jxkh-common/pom.xml

@@ -3,13 +3,15 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>JXKH</artifactId>
+        <artifactId>JSGLKH</artifactId>
         <groupId>com.rongwei</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jxkh-common</artifactId>
+    <groupId>com.rongwei</groupId>
+    <artifactId>jsglkh-common</artifactId>
+    <version>1.0-SNAPSHOT</version>
 
     <properties>
         <mysql.version>8.0.11</mysql.version>
@@ -18,19 +20,14 @@
     <dependencies>
         <dependency>
             <groupId>com.rongwei</groupId>
-            <artifactId>jxkh-entity</artifactId>
+            <artifactId>jsglkh-entity</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
             <version>3.1.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.rongwei</groupId>
-            <artifactId>rw-common-component</artifactId>
-            <version>1.1-SNAPSHOT</version>
-        </dependency>
+
     </dependencies>
 </project>

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/FileItemMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.rwcommon.base.BaseDao;
+import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
+
+/**
+ * 文件表
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2019-10-08 14:53:10
+ */
+public interface FileItemMapper extends BaseDao<SysFileItemDo> {
+	
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/FileItemService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
+
+
+/**
+ * 文件表
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2019-10-08 14:53:10
+ */
+public interface FileItemService extends IService<SysFileItemDo> {
+}
+

jxkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SynchronizationDataServiceImpl.java

@@ -1,13 +1,9 @@
 package com.rongwei.bscommon.sys.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.rongwei.bscommon.sys.service.SynchronizationDataService;
 import com.rongwei.bscommon.sys.utils.AttendanceAssessmentSdk;
 import com.rongwei.bsentity.dto.ApiCallDto;
-import com.rongwei.bsentity.dto.ApiReturnDto;
 import com.rongwei.rwcommon.base.R;
-import com.rongwei.rwcommoncomponent.file.dto.FileBO;
-import com.rongwei.rwcommoncomponent.file.service.impl.SysFileItemServiceImpl;
 import com.rongwei.rwcommonentity.commonservers.domain.SysFileItemDo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,12 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.util.Map;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
 
 /**
  * @author ：sc
@@ -30,7 +20,7 @@ import java.util.function.BiConsumer;
 public class SynchronizationDataServiceImpl implements SynchronizationDataService {
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
     @Autowired
-    private SysFileItemServiceImpl sysFileItemServiceImpl;
+    private FileItemServiceImpl sysFileItemServiceImpl;
     @Autowired
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
@@ -52,20 +42,14 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
     public R uploadFile(String fileId) {
         log.info("文件上传开始，本系统文件ID：{}", fileId);
         SysFileItemDo sysFileItemDo = sysFileItemServiceImpl.getById(fileId);
-        FileBO fileBO = FileBO.builder()
-                .fileName(sysFileItemDo.getFilename())
-                .realPath(sysFileItemDo.getFullpath())
-                .fileType(sysFileItemDo.getFiletype())
-                .build();
-        File newFile = new File(fileBO.getRealPath());
+        File newFile = new File(sysFileItemDo.getFullpath());
 
         ApiCallDto<Object> req = new ApiCallDto<>();
         req.setApiCode("fileUpload");
         req.setData(newFile);
-        R r = attendanceAssessmentSdk.fileUploadApiCall(req);
-        return r;
-    }
 
+        return R.ok().putData(attendanceAssessmentSdk.fileUploadApiCall(req));
+    }
 
 
 }

jxkh-common/src/main/java/com/rongwei/bscommon/sys/utils/ApiDattaOrgUtil.java

@@ -1,16 +1,23 @@
 package com.rongwei.bscommon.sys.utils;
 
+import com.rongwei.bscommon.sys.service.impl.SynchronizationDataServiceImpl;
+import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
@@ -23,18 +30,34 @@ import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTE
  * @date 2024/12/02
  */
 @Component
-public class ApiDattaOrgUtil {
+public class ApiDataOrgUtil {
 
     public static final String IMG_SPLIT_SIGN = "\\^_\\^";
-    private static final Logger log = LoggerFactory.getLogger(ApiDattaOrgUtil.class.getName());
+    private static final Logger log = LoggerFactory.getLogger(ApiDataOrgUtil.class.getName());
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static SynchronizationDataServiceImpl synchronizationDataService;
+    @Autowired
+    private AttendanceAssessmentSdk autoAttendanceAssessmentSdk;
+    @Autowired
+    private SynchronizationDataServiceImpl autoSynchronizationDataService;
 
     public static <T> Map<String, Object> assembleApiData(T infos,
                                                           List<OrgApiDataConfigDTO> orgApiDataConfigDTOS) {
         Map<String, Object> apiData = new HashMap();
+        boolean emptyKeyFlag = orgApiDataConfigDTOS.stream().anyMatch(info -> StringUtils.isBlank(info.getKey()));
+        if (emptyKeyFlag) {
+            throw new CustomException("存在key为空的配置文件信息");
+        }
 
         orgApiDataConfigDTOS.forEach(configDTO -> {
             String key = configDTO.getKey();
-            Object apply = configDTO.getGetDataFunction().apply(infos);
+            Function<T, Object> getDataFunction = configDTO.getGetDataFunction();
+            Object apply;
+            if (getDataFunction == null) {
+                apply = configDTO.getRealValue();
+            } else {
+                apply = configDTO.getGetDataFunction().apply(infos);
+            }
             apiData.put(key, ObjConver(apply, configDTO));
         });
         return apiData;
@@ -63,11 +86,20 @@ public class ApiDattaOrgUtil {
             }
             return Arrays.asList(filesInfo.split(IMG_SPLIT_SIGN)).stream().map(data -> {
                 String fileId = data.split("-;-")[1];
-                // 执行附件上传方法 返回真实的id
-                return "";
+                ApiCallDto apiCallDto = new ApiCallDto();
+                apiCallDto.setApiCode("fileUpload");
+                apiCallDto.setData(fileId);
+                R r = synchronizationDataService.uploadFile(fileId);
+                return r.getData().toString();
             }).collect(Collectors.joining(","));
         }
         log.debug("其他格式的数据");
         return renturnObj;
     }
+
+    @PostConstruct
+    public void init() {
+        attendanceAssessmentSdk = autoAttendanceAssessmentSdk;
+        synchronizationDataService = autoSynchronizationDataService;
+    }
 }

jxkh-common/src/main/java/com/rongwei/bscommon/sys/utils/AttendanceAssessmentSdk.java

@@ -122,7 +122,7 @@ public class AttendanceAssessmentSdk {
         return apiReturnDto;
     }
 
-    public R fileUploadApiCall(ApiCallDto paramVo) {
+    public String fileUploadApiCall(ApiCallDto paramVo) {
         logger.info("接口调用开始：{}", paramVo.getApiCode());
         // 请求地址
         String url = this.clientIp + this.apiVirtualDirectoryMap.get(paramVo.getApiCode());
@@ -160,7 +160,7 @@ public class AttendanceAssessmentSdk {
             Thread td = new Thread(() -> afterAll(paramVo, jsonStr, finalApiResult));
             td.start();
         }
-        return R.ok(fileId);
+        return fileId;
     }
 
     private String getToken() {