Selaa lähdekoodia

feature 解决参数异常

xiahan 8 kuukautta sitten
vanhempi
commit
41870fcb89
26 muutettua tiedostoa jossa 59 lisäystä ja 55 poistoa
  1. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/ApiRequestAndProcessingStrategy.java
  2. 4 4
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/CalculatorContext.java
  3. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC121ApiRequestAndProcessing.java
  4. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC122ApiRequestAndProcessing.java
  5. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC123ApiRequestAndProcessing.java
  6. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC124ApiRequestAndProcessing.java
  7. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC125ApiRequestAndProcessing.java
  8. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC126ApiRequestAndProcessing.java
  9. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC127ApiRequestAndProcessing.java
  10. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC128ApiRequestAndProcessing.java
  11. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC129ApiRequestAndProcessing.java
  12. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC130ApiRequestAndProcessing.java
  13. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC131ApiRequestAndProcessing.java
  14. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC132ApiRequestAndProcessing.java
  15. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC133ApiRequestAndProcessing.java
  16. 7 3
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC134ApiRequestAndProcessing.java
  17. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC135ApiRequestAndProcessing.java
  18. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC136ApiRequestAndProcessing.java
  19. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC137ApiRequestAndProcessing.java
  20. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC138ApiRequestAndProcessing.java
  21. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC139ApiRequestAndProcessing.java
  22. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC140ApiRequestAndProcessing.java
  23. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC141ApiRequestAndProcessing.java
  24. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC142ApiRequestAndProcessing.java
  25. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC143ApiRequestAndProcessing.java
  26. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC144ApiRequestAndProcessing.java

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/ApiRequestAndProcessingStrategy.java

@@ -11,7 +11,7 @@ import java.util.Map;
  * @date 2024/12/03
  */
 public interface ApiRequestAndProcessingStrategy {
-    Map<String, Object> assembleData(String id, String code);
+    Map<String, Object> assembleData(String id, String dataId, String code);
 
-    R apiCallAndDataProcessing(String id,String code,Map<String, Object> apiDataConfigDTOS);
+    R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiDataConfigDTOS);
 }

+ 4 - 4
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/CalculatorContext.java

@@ -19,11 +19,11 @@ public class CalculatorContext {
         this.strategy = strategy;
     }
 
-    public Map<String, Object> executeStrategy(String id,String code) {
-        return strategy.assembleData(id,code);
+    public Map<String, Object> executeStrategy(String id, String dataId, String code) {
+        return strategy.assembleData(id, dataId, code);
     }
 
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
-        return strategy.apiCallAndDataProcessing(id, code, apiCallData);
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
+        return strategy.apiCallAndDataProcessing(id, dataId, code, apiCallData);
     }
 }

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC121ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC121ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC122ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC122ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC123ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC123ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC124ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC124ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC124ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC125ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC125ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC126ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC126ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC126ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC127ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC127ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC128ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC128ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC128ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC129ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC129ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC130ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC130ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC130ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC131ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC131ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC132ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC132ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC132ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC133ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC133ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 7 - 3
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC134ApiRequestAndProcessing.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,18 +29,21 @@ public class KC134ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
 
         JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
-        Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
+        Map<String, Object> stringObjectMap = new HashMap<String,Object>(){{
+            put("INDEXID",id);
+            put("DATAID",dataId);
+        }};
         return stringObjectMap;
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC135ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC135ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC136ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC136ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC136ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC137ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC137ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC138ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC138ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC139ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC139ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC140ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC140ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC140ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC141ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC141ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC142ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC142ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC142ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC143ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC143ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);

+ 2 - 2
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC144ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC144ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dataId,String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC144ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     }
 
     @Override
-    public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
+    public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
         ApiCallDto paramVo = new ApiCallDto();
         paramVo.setData(apiCallData);
         paramVo.setApiCode(code);