快照

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxProjectManageService.java

@@ -100,5 +100,5 @@ public interface ZhcxProjectManageService extends IService<ZhcxProjectManageDo>
 
     void exportRectifySnapData(Map<String, Object> map, HttpServletResponse response);
 
-    R cronGenerateRectifyData(Map<String, Object> map);
+    void cronGenerateRectifyData();
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -1932,7 +1932,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
     }
 
     @Override
-    public R cronGenerateRectifyData(Map<String, Object> map) {
+    public void cronGenerateRectifyData() {
         List<ZhcxProjectManageDo> list = this.list(Wrappers.<ZhcxProjectManageDo>lambdaQuery()
                 .eq(ZhcxProjectManageDo:: getDeleted,"0"));
         for (ZhcxProjectManageDo manageDo : list) {
@@ -1949,14 +1949,17 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                             .groupBy(ZhcxProjectRectifySnapDo::getMachineno)).stream()
                     .map(ZhcxProjectRectifySnapDo::getMachineno)
                     .collect(Collectors.toList());
-            machinenoList.removeAll(collect);
-            if (machinenoList.size() > 0) {
+            // 计算差集
+            List<String> devicesToGenerate = machinenoList.stream()
+                    .filter(device -> !collect.contains(device))
+                    .collect(Collectors.toList());
+            if (devicesToGenerate.size() > 0) {
+                Map<String, Object> map = new HashMap(4);
                 map.put("prjid",projectId);
-                map.put("machineno",machinenoList);
+                map.put("machineno",devicesToGenerate);
                 zhcxProjectManageDao.generateRectifyData(map);
             }
         }
-        return null;
     }
 
     @Override

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxProjectManageController.java

@@ -208,9 +208,8 @@ public class ZhcxProjectManageController {
 
     @PostMapping("/cronGenerateRectifyData")
     @ApiOperation("生成整改快照")
-    public R cronGenerateRectifyData(@RequestBody Map<String,Object> map) {
-        R r = service.cronGenerateRectifyData(map);
-        return r;
+    public void cronGenerateRectifyData() {
+        service.cronGenerateRectifyData();
     }
 
     @PostMapping("/searchRectifyData")