From 2910280746fd6cb5a9a061a71d3f88d0b5bc437c Mon Sep 17 00:00:00 2001
From: gaoyutao <duguprogromer@163.com>
Date: Thu, 13 Nov 2025 10:28:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=A4=E6=8D=A2=E6=9C=BA?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=AD=96=E7=95=A5=E3=80=81=E4=BA=A4=E6=8D=A2?=
 =?UTF-8?q?=E6=9C=BA=E7=AE=A1=E7=90=86=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/controller/RmSwitchManagementController.java  | 2 +-
 .../main/resources/mapper/system/RmSwitchManagementMapper.xml  | 1 +
 .../rocketmq/service/impl/RmMonitorPolicyServiceImpl.java      | 3 +++
 .../snmp/scheduler/MultiSwitchCollectionScheduler.java         | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java
index 944a14f..288e8b1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java
@@ -36,7 +36,7 @@ public class RmSwitchManagementController extends BaseController
      */
     @RequiresPermissions("system:switchManagement:list")
     @PostMapping("/list")
-    public TableDataInfo list(RmSwitchManagement rmSwitchManagement)
+    public TableDataInfo list(@RequestBody RmSwitchManagement rmSwitchManagement)
     {
         PageDomain pageDomain = new PageDomain();
         pageDomain.setPageNum(rmSwitchManagement.getPageNum());
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
index 4f7abae..a860e84 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
@@ -59,6 +59,7 @@
                 and (snmp_address = #{snmpAddress} or switch_name like concat('%', #{switchName}, '%'))
              </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectRmSwitchManagementById" parameterType="Long" resultMap="RmSwitchManagementResult">
diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java
index c60bd8c..786b3a7 100644
--- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java
+++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java
@@ -273,6 +273,9 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
     public int addResourcePolicy(RmMonitorPolicy rmMonitorPolicy) {
         // 保存策略信息
         rmMonitorPolicy.setCreateBy(SecurityUtils.getUsername());
+        rmMonitorPolicy.setCreateTime(DateUtils.getNowDate());
+        rmMonitorPolicy.setStatus("0");
+        rmMonitorPolicy.setUpdateTime(DateUtils.getNowDate());
         rmMonitorPolicyMapper.insertRmMonitorPolicy(rmMonitorPolicy);
         // 拿到采集周期
         List<RmMonitorPolicyVo> collectionAndIdList = rmMonitorPolicy.getCollectionAndIdList();
diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java
index a0ebcf7..040f394 100644
--- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java
+++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java
@@ -107,7 +107,7 @@ public class MultiSwitchCollectionScheduler {
             if (collectVo.isCollect()) {
                 ScheduledFuture<?> task;
                 // 剔除switchVo中的其他oid
-                if (switchVo.getOtherOID() != null) {
+                if (switchVo.getOtherOID() != null && !switchVo.getOtherOID().isEmpty()) {
                     Map<String, String> otherOid = switchOidVo.getOtherOID();
                     String type = collectVo.getType();