xiahan пре 8 месеци
родитељ
комит
ee5db71f50
22 измењених фајлова са 71 додато и 43 уклоњено
  1. 20 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SynchronizationDataServiceImpl.java
  2. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC101ApiRequestAndProcessing.java
  3. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC102ApiRequestAndProcessing.java
  4. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC103ApiRequestAndProcessing.java
  5. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC104ApiRequestAndProcessing.java
  6. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC105ApiRequestAndProcessing.java
  7. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC106ApiRequestAndProcessing.java
  8. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC107ApiRequestAndProcessing.java
  9. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC108ApiRequestAndProcessing.java
  10. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC109ApiRequestAndProcessing.java
  11. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC110ApiRequestAndProcessing.java
  12. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC111ApiRequestAndProcessing.java
  13. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC112ApiRequestAndProcessing.java
  14. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC113ApiRequestAndProcessing.java
  15. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC114ApiRequestAndProcessing.java
  16. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC115ApiRequestAndProcessing.java
  17. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC116ApiRequestAndProcessing.java
  18. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC117ApiRequestAndProcessing.java
  19. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC118ApiRequestAndProcessing.java
  20. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC119ApiRequestAndProcessing.java
  21. 2 2
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC120ApiRequestAndProcessing.java
  22. 11 3
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/KC134ApiRequestAndProcessing.java

+ 20 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SynchronizationDataServiceImpl.java

@@ -40,24 +40,34 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
         switch (code) {
             case "KC101":
                 apiRequestAndProcessingStrategy = new KC101ApiRequestAndProcessing();
+                break;
             case "KC103":
                 apiRequestAndProcessingStrategy = new KC103ApiRequestAndProcessing();
+                break;
             case "KC105":
                 apiRequestAndProcessingStrategy = new KC105ApiRequestAndProcessing();
+                break;
             case "KC107":
                 apiRequestAndProcessingStrategy = new KC107ApiRequestAndProcessing();
+                break;
             case "KC109":
                 apiRequestAndProcessingStrategy = new KC109ApiRequestAndProcessing();
+                break;
             case "KC111":
                 apiRequestAndProcessingStrategy = new KC111ApiRequestAndProcessing();
+                break;
             case "KC113":
                 apiRequestAndProcessingStrategy = new KC113ApiRequestAndProcessing();
+                break;
             case "KC115":
                 apiRequestAndProcessingStrategy = new KC115ApiRequestAndProcessing();
+                break;
             case "KC117":
                 apiRequestAndProcessingStrategy = new KC117ApiRequestAndProcessing();
+                break;
             case "KC119":
                 apiRequestAndProcessingStrategy = new KC119ApiRequestAndProcessing();
+                break;
             case "KC121":
                 apiRequestAndProcessingStrategy = new KC121ApiRequestAndProcessing();
                 break;
@@ -110,24 +120,34 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
         switch (code) {
             case "KC102":
                 apiRequestAndProcessingStrategy = new KC102ApiRequestAndProcessing();
+                break;
             case "KC104":
                 apiRequestAndProcessingStrategy = new KC104ApiRequestAndProcessing();
+                break;
             case "KC106":
                 apiRequestAndProcessingStrategy = new KC106ApiRequestAndProcessing();
+                break;
             case "KC108":
                 apiRequestAndProcessingStrategy = new KC108ApiRequestAndProcessing();
+                break;
             case "KC110":
                 apiRequestAndProcessingStrategy = new KC110ApiRequestAndProcessing();
+                break;
             case "KC112":
                 apiRequestAndProcessingStrategy = new KC112ApiRequestAndProcessing();
+                break;
             case "KC114":
                 apiRequestAndProcessingStrategy = new KC114ApiRequestAndProcessing();
+                break;
             case "KC116":
                 apiRequestAndProcessingStrategy = new KC116ApiRequestAndProcessing();
+                break;
             case "KC118":
                 apiRequestAndProcessingStrategy = new KC118ApiRequestAndProcessing();
+                break;
             case "KC120":
                 apiRequestAndProcessingStrategy = new KC120ApiRequestAndProcessing();
+                break;
             case "KC122":
                 apiRequestAndProcessingStrategy = new KC122ApiRequestAndProcessing();
                 break;

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

@@ -28,7 +28,7 @@ public class KC101ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC101ApiRequestAndProcessing 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/KC102ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC102ApiRequestAndProcessing 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/KC103ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC103ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC103ApiRequestAndProcessing 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/KC104ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC104ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC104ApiRequestAndProcessing 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/KC105ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC105ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC105ApiRequestAndProcessing 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/KC106ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC106ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC106ApiRequestAndProcessing 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/KC107ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC107ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC107ApiRequestAndProcessing 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/KC108ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC108ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC108ApiRequestAndProcessing 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/KC109ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC109ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC109ApiRequestAndProcessing 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/KC110ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC110ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC110ApiRequestAndProcessing 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/KC111ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC111ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id, String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC111ApiRequestAndProcessing 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/KC112ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC112ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC112ApiRequestAndProcessing 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/KC113ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC113ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC113ApiRequestAndProcessing 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/KC114ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC114ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC114ApiRequestAndProcessing 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/KC115ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC115ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC115ApiRequestAndProcessing 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/KC116ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC116ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC116ApiRequestAndProcessing 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/KC117ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC117ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC117ApiRequestAndProcessing 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/KC118ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC118ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC118ApiRequestAndProcessing 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/KC119ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC119ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC119ApiRequestAndProcessing 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/KC120ApiRequestAndProcessing.java

@@ -28,7 +28,7 @@ public class KC120ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
     @Override
-    public Map<String, Object> assembleData(String id,String dateId) {
+    public Map<String, Object> assembleData(String id,String dateId, String code) {
         List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
 
         assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
@@ -39,7 +39,7 @@ public class KC120ApiRequestAndProcessing 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);

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

@@ -19,11 +19,19 @@ import java.util.Map;
  */
 @Component
 public class KC134ApiRequestAndProcessing implements ApiRequestAndProcessingStrategy {
-    @Autowired
-    private AttendanceAssessmentSdk attendanceAssessmentSdk;
 
+    private static AttendanceAssessmentSdk attendanceAssessmentSdk;
+    private static JtXcjhqdServiceImpl jtXcjhqdService;
+
+    @Autowired
+    public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
+        KC134ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
+    }
     @Autowired
-    private JtXcjhqdServiceImpl jtXcjhqdService;
+    public void setJtXcjhqdServiceImpl(JtXcjhqdServiceImpl jtXcjhqdService) {
+        KC134ApiRequestAndProcessing.jtXcjhqdService = jtXcjhqdService;
+    }
+
 
     @Override
     public Map<String, Object> assembleData(String id, String dataId, String code) {