feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/AssembleApiDataStrategy.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.strategy;
 import com.rongwei.bsentity.dto.OrgApiDataConfigDTO;
 
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * assembleApiDataCalculateStrategy class
@@ -13,4 +14,7 @@ import java.util.List;
 public interface AssembleApiDataStrategy {
     List<OrgApiDataConfigDTO> assembleData(String id);
 
+
+
+
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/AssembleKC134ApiData.java

@@ -8,6 +8,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static com.rongwei.bscommon.sys.utils.ApiDataOrgUtil.setOrdinaryDatePattern;
+
 /**
  * AssembleK34ApiData class
  *
@@ -17,10 +19,10 @@ import java.util.List;
 @Component
 public class AssembleKC134ApiData implements AssembleApiDataStrategy {
     @Override
-    public List<OrgApiDataConfigDTO> assembleData(String id) {
+    public  List<OrgApiDataConfigDTO>  assembleData(String id) {
         List<OrgApiDataConfigDTO> assembleData=new ArrayList<>();
-        OrgApiDataConfigDTO dataid = new OrgApiDataConfigDTO("DATAID", JtGsjtbsj::getId);
-        assembleData.add(dataid);
+
+        assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
         return assembleData;
     }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/ApiDataOrgUtil.java

@@ -51,12 +51,12 @@ public class ApiDataOrgUtil {
 
         orgApiDataConfigDTOS.forEach(configDTO -> {
             String key = configDTO.getKey();
-            Function<T, Object> getDataFunction = configDTO.getGetDataFunction();
+            Function<T, Object> getDataFunction = configDTO.getDataFunction();
             Object apply;
             if (getDataFunction == null) {
                 apply = configDTO.getRealValue();
             } else {
-                apply = configDTO.getGetDataFunction().apply(infos);
+                apply = configDTO.getDataFunction().apply(infos);
             }
             apiData.put(key, ObjConver(apply, configDTO));
         });
@@ -97,6 +97,49 @@ public class ApiDataOrgUtil {
         return renturnObj;
     }
 
+    public static <T> OrgApiDataConfigDTO setOrdinaryDatePattern(String key, Function<T, Object> getDataFunction) {
+        OrgApiDataConfigDTO excelFieldDescDTO = new OrgApiDataConfigDTO();
+        excelFieldDescDTO.setKey(key);
+        excelFieldDescDTO.setDataFunction(getDataFunction);
+        return excelFieldDescDTO;
+    }
+
+    public static <T> OrgApiDataConfigDTO setDatePattern(String key, Function<T, Object> getDataFunction, String datePattern) {
+        OrgApiDataConfigDTO excelFieldDescDTO = new OrgApiDataConfigDTO();
+        excelFieldDescDTO.setKey(key);
+        excelFieldDescDTO.setDataFunction(getDataFunction);
+        excelFieldDescDTO.setDatePattern(datePattern);
+        if (StringUtils.isNotBlank(datePattern)) {
+            excelFieldDescDTO.setDateFlag(true);
+        }
+        return excelFieldDescDTO;
+    }
+
+    public static <T> OrgApiDataConfigDTO setFileInfo(String key,
+                                                      Function<T, Object> getDataFunction,
+                                                      boolean fileFlag) {
+        OrgApiDataConfigDTO excelFieldDescDTO = new OrgApiDataConfigDTO();
+        excelFieldDescDTO.setKey(key);
+        excelFieldDescDTO.setDataFunction(getDataFunction);
+        excelFieldDescDTO.setFileFlag(fileFlag);
+        return excelFieldDescDTO;
+    }
+
+    public static <T> OrgApiDataConfigDTO setRealValue(String key,
+                                                       Object realValue,
+                                                       String datePattern,
+                                                       boolean fileFlag) {
+        OrgApiDataConfigDTO excelFieldDescDTO = new OrgApiDataConfigDTO();
+        excelFieldDescDTO.setKey(key);
+        excelFieldDescDTO.setRealValue(realValue);
+        excelFieldDescDTO.setDatePattern(datePattern);
+        if (StringUtils.isNotBlank(datePattern)) {
+            excelFieldDescDTO.setDateFlag(true);
+        }
+        excelFieldDescDTO.setFileFlag(fileFlag);
+        return excelFieldDescDTO;
+    }
+
     @PostConstruct
     public void init() {
         attendanceAssessmentSdk = autoAttendanceAssessmentSdk;

jsglkh-entity/src/main/java/com/rongwei/bsentity/dto/OrgApiDataConfigDTO.java

@@ -1,6 +1,5 @@
 package com.rongwei.bsentity.dto;
 
-import com.rongwei.rwcommon.utils.StringUtils;
 import lombok.Data;
 
 import java.util.function.Function;
@@ -18,7 +17,7 @@ public class OrgApiDataConfigDTO<T> {
     /**
      * 字段描述
      */
-    private Function<T, Object> getDataFunction;
+    private Function<T, Object> dataFunction;
 
     /**
      * 时间格式转化
@@ -31,28 +30,7 @@ public class OrgApiDataConfigDTO<T> {
     /**
      * 存放无法从子表获取到的数据
      */
-    private String realValue;
-
-    public OrgApiDataConfigDTO(String key, Function<T, Object> getDataFunction, String datePattern) {
-        this.key = key;
-        this.getDataFunction = getDataFunction;
-        this.datePattern = datePattern;
-        if (StringUtils.isNotBlank(datePattern)) {
-            this.dateFlag = true;
-        }
-    }
-
-
-    public OrgApiDataConfigDTO(String key, Function<T, Object> getDataFunction, Boolean fileFlag) {
-        this.key = key;
-        this.getDataFunction = getDataFunction;
-        this.fileFlag = fileFlag;
-    }
-
-    public OrgApiDataConfigDTO(String key, Function<T, Object> getDataFunction) {
-        this.key = key;
-        this.getDataFunction = getDataFunction;
-    }
-    private void setDateFlag(Boolean dateFlag) {
-    }
+    private Object realValue;
+
+
 }