liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaoyutao
2025-09-28 09:36:24 +08:00
parent cc9593b4bf
commit 9fa62124e6
20 changed files with 214 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/InitialSwitchInfoDetails.java
View File

@@ -97,15 +97,15 @@ public class InitialSwitchInfoDetails 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;
}

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceGroup.java
View File

@@ -62,5 +62,9 @@ public class RmResourceGroup extends BaseEntity
private String discoveryRules;
/** 资源id */
private String resourceIds;
/** 资源类型 */
private String resourceType;
/** 查询条件名称 */
private String queryName;
}

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

@@ -127,5 +127,7 @@ public class RmResourceRegistration extends BaseEntity
private String monitorItems;
/** 自动发现项 */
private String discoveryRules;
/** 查询名称 */
private String queryName;
}

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceGroupServiceImpl.java
View File

@@ -129,6 +129,8 @@ public class RmResourceGroupServiceImpl implements IRmResourceGroupService
pageDomain.setPageSize(rmResourceGroup.getPageSize());
if(rmResourceGroup.getId() == null){
RmResourceRegistration queryParam = new RmResourceRegistration();
queryParam.setResourceType(rmResourceGroup.getResourceType());
queryParam.setQueryName(rmResourceGroup.getQueryName());
// 开启分页
startPage(pageDomain);
List<RmResourceRegistration> rmResourceRegistrationList = rmResourceRegistrationMapper.selectRmResourceRegistrationList(queryParam);

1
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml
View File

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="creatorName != null and creatorName != ''"> and creator_name like concat('%', #{creatorName}, '%')</if>
<if test="updaterId != null "> and updater_id = #{updaterId}</if>
<if test="updaterName != null and updaterName != ''"> and updater_name like concat('%', #{updaterName}, '%')</if>
<if test="queryName != null and queryName != ''"> and (hardware_sn = #{queryName} or resource_name like concat('%', #{queryName}, '%')) </if>
</where>
order by create_time desc
</select>