资源监控模块接口新增,agent下发信息配置

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceGroupController.java

@@ -107,8 +107,8 @@ public class RmResourceGroupController extends BaseController
      * 获取资源分组详细信息
      */
     @InnerAuth
-    @GetMapping(value = "/getResourceGroupMsgById")
-    public R<RmResourceGroup> getResourceGroupMsgById(Long id)
+    @PostMapping(value = "/getResourceGroupMsgById")
+    public R<RmResourceGroup> getResourceGroupMsgById(@RequestBody Long id)
     {
         return R.ok(rmResourceGroupService.selectRmResourceGroupById(id));
     }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java

@@ -149,8 +149,8 @@ public class RmResourceRegistrationController extends BaseController
      * @param ids
      * @return
      */
-    @GetMapping("/getRegistrationByIds")
-    public R<List<RmResourceRegistration>> getRegistrationByIds(String[] ids)
+    @PostMapping("/getRegistrationByIds")
+    public R<List<RmResourceRegistration>> getRegistrationByIds(@RequestBody String[] ids)
     {
         List<RmResourceRegistration> list = rmResourceRegistrationService.getRegistrationByIds(ids);
         return R.ok(list);

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceRegistration.java

@@ -91,6 +91,8 @@ public class RmResourceRegistration extends BaseEntity
     /** 在线状态 0-离线，1-在线 */
     @Excel(name = "在线状态",readConverterExp = "0=离线,1=在线")
     private String onlineStatus;
+    @Excel(name = "交换机在线状态",readConverterExp = "0=离线,1=在线")
+    private String switchOnlineStatus;
 
     /** 描述 */
     @Excel(name = "描述")

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.MsgEnum;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
@@ -189,8 +190,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
         }
 
         // 发送消息通知
-//        sendRegistrationMessage(rmResourceRegistration);
-
+        sendRegistrationMessage(rmResourceRegistration);
         // 更新注册状态
         return updateRegistrationStatus(rmResourceRegistration);
     }
@@ -219,7 +219,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
      * 发送注册/断开连接消息
      */
     private void sendRegistrationMessage(RmResourceRegistration registration) {
-        String messageType = "1".equals(registration.getRegistrationStatus()) ? "REGISTER" : "DISCONNECT";
+        String messageType = "1".equals(registration.getRegistrationStatus()) ? MsgEnum.注册.getValue() : MsgEnum.断开.getValue();
         ResourceVo resourceVo = createResourceVo(registration);
 
         MessageVo messageVo = new MessageVo();