From 00b2230773737be28ab35f4a22760a17f54989c7 Mon Sep 17 00:00:00 2001
From: gaoyutao <duguprogromer@163.com>
Date: Fri, 13 Mar 2026 17:58:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81agent=E6=89=B9=E9=87=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=99=90=E5=88=B610=E5=8F=B0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RmResourceRegistrationServiceImpl.java   |  5 +++++
 .../controller/RmAgentManagementController.java   |  5 ++++-
 .../impl/RmAgentManagementServiceImpl.java        | 15 ++++++++++-----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java
index 47e21de..f7c4f38 100644
--- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java
+++ b/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());
+                        }
                     }
                 });
 
diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java
index 467e91a..f9726d2 100644
--- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java
+++ b/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();
     }
 
diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java
index 911f098..d5f018b 100644
--- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/RmAgentManagementServiceImpl.java
+++ b/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 1;
+        return processAgentData(rmAgentManagement);
     }
 
     @Override
@@ -228,8 +227,13 @@ public class RmAgentManagementServiceImpl implements IRmAgentManagementService
      */
     @Override
     public int updateAgentNow(RmAgentManagement rmAgentManagement) {
-        processAgentData(rmAgentManagement);
-        return 1;
+        String clientIds = rmAgentManagement.getDeployDevice();
+        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;
     }
 }