rocktmqjson串减少转义次数，数据类型与接收数据适配

ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfo.java

@@ -50,17 +50,17 @@ public class InitialSwitchInfo extends BaseEntity
     /** 交换机ip */
     private String switchIp;
     /** 端口配置速率(Mbps) */
-    private BigDecimal ifSpeed;
+    private String ifSpeed;
     /** 入站丢包 */
-    private Integer ifInDiscards;
+    private String ifInDiscards;
     /** 出站丢包 */
-    private Integer ifOutDiscards;
+    private String ifOutDiscards;
     /** 错误的入站数据包数量 */
-    private Integer ifInErrors;
+    private String ifInErrors;
     /** 错误的出站数据包数量 */
-    private Integer ifOutErrors;
+    private String ifOutErrors;
     /** 端口索引 */
-    private Integer ifIndex;
+    private String ifIndex;
 
 
 }

ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/InitialSwitchInfoTemp.java

@@ -54,15 +54,15 @@ public class InitialSwitchInfoTemp extends BaseEntity
     /** 交换机ip */
     private String switchIp;
     /** 端口配置速率(Mbps) */
-    private BigDecimal ifSpeed;
+    private String ifSpeed;
     /** 入站丢包 */
-    private Integer ifInDiscards;
+    private String ifInDiscards;
     /** 出站丢包 */
-    private Integer ifOutDiscards;
+    private String ifOutDiscards;
     /** 错误的入站数据包数量 */
-    private Integer ifInErrors;
+    private String ifInErrors;
     /** 错误的出站数据包数量 */
-    private Integer ifOutErrors;
+    private String ifOutErrors;
     /** 端口索引 */
-    private Integer ifIndex;
+    private String ifIndex;
 }

ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmAgentManagement.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -49,7 +48,7 @@ public class RmAgentManagement extends BaseEntity
     /** 定时更新时间（cron表达式） */
     @Excel(name = "定时更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime scheduledUpdateTime;
+    private Date scheduledUpdateTime;
     /** 文件地址格式 */
     @Excel(name = "文件地址格式")
     private Long fileUrlType;
@@ -73,5 +72,7 @@ public class RmAgentManagement extends BaseEntity
     private String includeIds;
     /** 生效服务器名称 */
     private String includeNames;
+    /** 查询条件名称 */
+    private String queryName;
 
 }

ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/AgentUpdateVo.java

@@ -1,10 +1,8 @@
 package com.ruoyi.rocketmq.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
 
 @Data
 public class AgentUpdateVo {
@@ -17,8 +15,7 @@ public class AgentUpdateVo {
     /** 执行方式：0、立即执行；1、定时执行； */
     private Integer method;
     /** 定时时间，执行方式为1、定时执行时该字段必传 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime policyTime;
+    private long policyTime;
     /** 时间戳 */
     private long timestamp = Instant.now().getEpochSecond();
 }

ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RegisterSwitchVo.java

@@ -11,7 +11,7 @@ public class RegisterSwitchVo {
     /** 服务器端口 */
     private Integer clientPort;
     /** 交换机信息 */
-    private String switchBoard;
+    private SwitchOidVo switchBoard;
     /** 时间戳（秒） */
     private long timestamp = Instant.now().getEpochSecond();
 

ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/SwitchOidVo.java

@@ -2,18 +2,23 @@ package com.ruoyi.rocketmq.domain.vo;
 
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 public class SwitchOidVo {
-    private String netOID;
-    private String moduleOID;
-    private String mpuOID;
-    private String pwrOID;
-    private String fanOID;
-    private String otherOID;
+    private Map<String, String> netOID;
+    private Map<String, String> moduleOID;
+    private Map<String, String> mpuOID;
+    private Map<String, String> pwrOID;
+    private Map<String, String> fanOID;
+    private Map<String, String> otherOID;
     /** 团体名 */
     private String community;
     /** ip地址 */
     private String ip;
     /** 端口 */
     private Integer port;
+    /** 过滤值 */
+    private Map<String, List<String>> filters;
 }