feature 代码提交

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

@@ -197,12 +197,12 @@ public class SynchronizationDataServiceImpl implements SynchronizationDataServic
         CalculatorContext primaryContext = new CalculatorContext(apiRequestAndProcessingStrategy);
 
         for (int i = 0; i < idList.size(); i++) {
+            Map<String, Object> apiCallData=null;
             // 数据组装
-            Map<String, Object> apiCallData = null;
             if (StringUtils.isNotBlank(dataIdList.get(i))) {
                 apiCallData = primaryContext.executeStrategy(idList.get(i), dataIdList.get(i), code);
-                primaryContext.apiCallAndDataProcessing(idList.get(i), dataIdList.get(i), code, apiCallData);
             }
+            primaryContext.apiCallAndDataProcessing(idList.get(i), dataIdList.get(i), code, apiCallData);
         }
 
         // 接口请求并 处理

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

@@ -22,7 +22,7 @@ public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
     private static JtGsjtbsjServiceImpl jtGsjtbsjService;
 
-
+    @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC102ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }
@@ -50,11 +50,8 @@ public class KC102ApiRequestAndProcessing implements ApiRequestAndProcessingStra
             paramVo.setApiCode(code);
             ApiReturnDto apiReturnDto = attendanceAssessmentSdk.apiCall(paramVo);
         }
-
         // 后续逻辑处理
-        jtGsjtbsjService.removeByMap(new HashMap<String, Object>() {{
-            put("DATAID", dataId);
-        }});
+        jtGsjtbsjService.removeById(id);
         return R.ok();
     }
 }

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

@@ -28,7 +28,7 @@ public class KC104ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
     private static JtZjfjflqdServiceImpl jtZjfjflqdService;
 
-
+    @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC104ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }

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

@@ -28,7 +28,7 @@ public class KC106ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
     private static JtZjfjflqdServiceImpl jtZjfjflqdService;
 
-
+    @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC106ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }

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

@@ -28,7 +28,7 @@ public class KC108ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
     private static JtZjfjflqdServiceImpl jtZjfjflqdService;
 
-
+    @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC108ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }

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

@@ -22,7 +22,7 @@ public class KC110ApiRequestAndProcessing implements ApiRequestAndProcessingStra
     private static AttendanceAssessmentSdk attendanceAssessmentSdk;
     private static JtZjfjflqdServiceImpl jtZjfjflqdService;
 
-
+    @Autowired
     public void setAttendanceAssessmentSdk(AttendanceAssessmentSdk attendanceAssessmentSdk) {
         KC110ApiRequestAndProcessing.attendanceAssessmentSdk = attendanceAssessmentSdk;
     }

jsglkh-server/src/main/java/com/rongwei/controller/SynchronizationDataController.java

@@ -44,7 +44,7 @@ public class SynchronizationDataController {
         String dataIds = jsonDatas.getOrDefault("dataIds", "");
         List<String> list = Arrays.asList(dataIds.split(","));
         List<String> ids = list.stream().map(data -> data.split(":")[0]).collect(Collectors.toList());
-        List<String> dataIdList = list.stream().map(data -> data.split(":")[1]).collect(Collectors.toList());
+        List<String> dataIdList = list.stream().map(data -> data.split(":").length>1?data.split(":")[1]:"").collect(Collectors.toList());
         return synchronizationDataService.deleteDataSync(ids, dataIdList, jsonDatas.getOrDefault("code", ""));
     }