1、agent批量更新限制10台设备。

tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java

@@ -431,6 +431,8 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
         if (CollectionUtils.isEmpty(pageList)) {
             return;
         }
+        // 查询agent最新版本
+        RmResourceRegistration rmResourceRegistration = rmResourceRegistrationMapper.getMaxAgentVersion();
         String cpuTbaleName = TableSubUtil.getTableName(DateUtils.getNowDate(), "initial_cpu_info");
         String memTbaleName = TableSubUtil.getTableName(DateUtils.getNowDate(), "initial_system_other_collect_data");
         long startTime = System.currentTimeMillis();
@@ -513,6 +515,9 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
                         if (clientNetworks != null && !clientNetworks.isEmpty()) {
                             setNetWorkMsgWithNetworkList(registration, clientNetworks);
                         }
+                        if(rmResourceRegistration != null){
+                            registration.setMaxAgentVersion(rmResourceRegistration.getMaxAgentVersion());
+                        }
                     }
                 });
 

tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java

@@ -78,7 +78,10 @@ public class RmAgentManagementController extends BaseController
      */
     @PostMapping("/updateAgentNow")
     public AjaxResult updateAgentNow(@RequestBody RmAgentManagement rmAgentManagement){
-        rmAgentManagementService.updateAgentNow(rmAgentManagement);
+        int rows = rmAgentManagementService.updateAgentNow(rmAgentManagement);
+        if(rows == -1){
+            error("一次更新不能超过10台设备");
+        }
         return success();
     }
 

tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java

@@ -198,8 +198,7 @@ public class RmAgentManagementServiceImpl implements IRmAgentManagementService
      */
     @Override
     public int addUpdatePolicy(RmAgentManagement rmAgentManagement) {
-        processAgentData(rmAgentManagement);
+        return processAgentData(rmAgentManagement);
-        return 1;
     }
 
     @Override
@@ -228,8 +227,13 @@ public class RmAgentManagementServiceImpl implements IRmAgentManagementService
      */
     @Override
     public int updateAgentNow(RmAgentManagement rmAgentManagement) {
-        processAgentData(rmAgentManagement);
+        String clientIds = rmAgentManagement.getDeployDevice();
-        return 1;
+        String[] clientIdArr = clientIds.split("\n");
+        // 校验clientId数量不能超过10个
+        if (clientIdArr.length > 10) {
+            return -1;
+        }
+        return processAgentData(rmAgentManagement);
     }
 
     /**
@@ -290,7 +294,7 @@ public class RmAgentManagementServiceImpl implements IRmAgentManagementService
      * 处理agen更新数据
      * @param rmAgentManagement
      */
-    public void processAgentData(RmAgentManagement rmAgentManagement){
+    public int processAgentData(RmAgentManagement rmAgentManagement){
         String clientIds = rmAgentManagement.getDeployDevice();
         String[] clientIdArr = clientIds.split("\n");
         for (String clientId : clientIdArr) {
@@ -355,5 +359,6 @@ public class RmAgentManagementServiceImpl implements IRmAgentManagementService
                 log.error("发送设备配置失败，deviceId: {}", rmAgentManagement.getHardwareSn(), e);
             }
         }
+        return 1;
     }
 }