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

优化服务器管理搜索、监控看板优化

Browse Source
This commit is contained in:
gaoyutao
2025-11-19 11:31:43 +08:00
parent 12ca2b2066
commit 54fafb90bd
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class RmResourceRegistrationController extends BaseController
public TableDataInfo list(@RequestBody RmResourceRegistration rmResourceRegistration) public TableDataInfo list(@RequestBody RmResourceRegistration rmResourceRegistration)
{ {
Map<String, Object> resultMap = rmResourceRegistrationService.getRegistrationTableInfoList(rmResourceRegistration); Map<String, Object> resultMap = rmResourceRegistrationService.getRegistrationTableInfoList(rmResourceRegistration);
if(rmResourceRegistration.getQueryParam() != null){ if(rmResourceRegistration.getQueryParam() != null && rmResourceRegistration.getQueryParam() != ""){
return getDataTable((List<RmResourceRegistration>) resultMap.get("list"), (int) resultMap.get("total")); return getDataTable((List<RmResourceRegistration>) resultMap.get("list"), (int) resultMap.get("total"));
} }
return getDataTable((List<RmResourceRegistration>) resultMap.get("list")); return getDataTable((List<RmResourceRegistration>) resultMap.get("list"));
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmMonitorConfigDetailsServiceImpl.java
+3 -1
View File
@@ -142,7 +142,9 @@ public class RmMonitorConfigDetailsServiceImpl implements IRmMonitorConfigDetail
if(rmMonitorConfig != null){ if(rmMonitorConfig != null){
// 拿到开始时间 // 拿到开始时间
String startTime = rmMonitorConfig.getMonitorStartTime(); String startTime = rmMonitorConfig.getMonitorStartTime();
queryParam.setStartTime(startTime); if(queryParam.getStartTime() == null){
queryParam.setStartTime(startTime);
}
if(queryParam.getEndTime() == null){ if(queryParam.getEndTime() == null){
queryParam.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss")); queryParam.setEndTime(DateUtils.dateTimeNow("yyyy-MM-dd HH:mm:ss"));
} }
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java
+2 -2
View File
@@ -82,7 +82,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
public Map<String, Object> getRegistrationTableInfoList(RmResourceRegistration rmResourceRegistration) public Map<String, Object> getRegistrationTableInfoList(RmResourceRegistration rmResourceRegistration)
{ {
Map<String, Object> resultMap = new HashMap(); Map<String, Object> resultMap = new HashMap();
if(rmResourceRegistration.getQueryParam() == null){ if(rmResourceRegistration.getQueryParam() == null || rmResourceRegistration.getQueryParam() == ""){
PageDomain pageDomain = new PageDomain(); PageDomain pageDomain = new PageDomain();
pageDomain.setPageNum(rmResourceRegistration.getPageNum()); pageDomain.setPageNum(rmResourceRegistration.getPageNum());
pageDomain.setPageSize(rmResourceRegistration.getPageSize()); pageDomain.setPageSize(rmResourceRegistration.getPageSize());
@@ -95,7 +95,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
setNetWorkMsg(resourceRegistration); setNetWorkMsg(resourceRegistration);
} }
} }
if(rmResourceRegistration.getQueryParam() != null){ if(rmResourceRegistration.getQueryParam() != null && rmResourceRegistration.getQueryParam() != ""){
String queryValue = rmResourceRegistration.getQueryParam().trim(); String queryValue = rmResourceRegistration.getQueryParam().trim();
// 筛选公网IP私网IP设备SN相等的数据 // 筛选公网IP私网IP设备SN相等的数据
// 从rmResourceRegistrationList列表中筛选符合条件的数据 // 从rmResourceRegistrationList列表中筛选符合条件的数据
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml
+1 -1
View File
@@ -287,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="endTime != null"> <if test="endTime != null">
and create_time &lt;= #{endTime} and create_time &lt;= #{endTime}
</if> </if>
<if test="clientIds != '' and clientIds != null"> <if test="clientIds != null">
and client_id in and client_id in
<foreach collection="clientIds.split(',')" item="clientId" open="(" separator="," close=")"> <foreach collection="clientIds.split(',')" item="clientId" open="(" separator="," close=")">
#{clientId} #{clientId}
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/InitialSwitchInfoDetailsMapper.xml
+1 -1
View File
@@ -370,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY max_speed desc ORDER BY max_speed desc
</select> </select>
<select id="geSwitchListByMonitorView" parameterType="InitialSwitchInfoDetails" resultType="InitialSwitchInfoDetails"> <select id="geSwitchListByMonitorView" parameterType="InitialSwitchInfoDetails" resultType="InitialSwitchInfoDetails">
select client_id clientId, name, in_speed inSpeed, out_speed outSpeed, create_time createTime from initial_switch_info_details select switch_name switchName,client_id clientId, name, in_speed inSpeed, out_speed outSpeed, create_time createTime from initial_switch_info_details
<where> <where>
<if test="startTime != null"> <if test="startTime != null">
and create_time &gt;= #{startTime} and create_time &gt;= #{startTime}
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml
+1 -1
View File
@@ -56,7 +56,7 @@
<if test="switchPassword != null and switchPassword != ''"> and switch_password = #{switchPassword}</if> <if test="switchPassword != null and switchPassword != ''"> and switch_password = #{switchPassword}</if>
<if test="clientId != null and clientId != ''"> and client_id = #{clientId}</if> <if test="clientId != null and clientId != ''"> and client_id = #{clientId}</if>
<if test="queryName != null and queryName != ''"> <if test="queryName != null and queryName != ''">
and (snmp_address = #{snmpAddress} or switch_name like concat('%', #{switchName}, '%')) and (snmp_address = #{queryName} or switch_name like concat('%', #{queryName}, '%'))
</if> </if>
</where> </where>
order by create_time desc order by create_time desc