From 4d1503e988d71994e3cc678a830ea53d4af183db Mon Sep 17 00:00:00 2001 From: gaoyutao Date: Fri, 7 Nov 2025 18:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E5=B1=82bit=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0=E3=80=81=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E7=9B=91=E6=8E=A7=E7=AD=96=E7=95=A5clientId?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/handler/MessageHandler.java | 4 +-- .../impl/RmMonitorPolicyServiceImpl.java | 33 +++++++++---------- .../ProcessSwitchCollectDataService.java | 4 +-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java index 3ba8695..9e39644 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java @@ -680,7 +680,7 @@ public class MessageHandler { // 检查相减结果是否为非负数 if (inDiff.compareTo(BigDecimal.ZERO) >= 0) { - iface.setInSpeed(inDiff.divide(divisor, 2, RoundingMode.HALF_UP).toString()); + iface.setInSpeed(inDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString()); }else{ iface.setInSpeed(null); } @@ -693,7 +693,7 @@ public class MessageHandler { // 检查相减结果是否为非负数 if (outDiff.compareTo(BigDecimal.ZERO) >= 0) { - iface.setOutSpeed(outDiff.divide(divisor, 2, RoundingMode.HALF_UP).toString()); + iface.setOutSpeed(outDiff.divide(divisor, 0, RoundingMode.HALF_UP).toString()); }else{ iface.setOutSpeed(null); } 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 436de82..c60bd8c 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 @@ -5,7 +5,6 @@ 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.utils.StringUtils; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.rocketmq.domain.*; import com.ruoyi.rocketmq.domain.vo.*; @@ -386,22 +385,22 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService // 1. 获取资源监控策略基础信息 RmMonitorPolicy rmMonitorPolicy = rmMonitorPolicyMapper.selectRmMonitorPolicyById(id); if(rmMonitorPolicy != null){ - String clientIds = rmMonitorPolicy.getDeployDevice(); - if(clientIds != null){ - String[] clientArr = clientIds.split("\n"); - if(StringUtils.equals("switch",rmMonitorPolicy.getResourceType())){ - List names = new ArrayList<>(); - for (String clientId : clientArr) { - // 根据clientId查询设备名称 - String switchName = dataProcessUtil.getDeviceNameByClientId(clientId); - names.add(switchName); - } - rmMonitorPolicy.setDeployDevice(String.join(",", names)); - } - if(StringUtils.equals("linux",rmMonitorPolicy.getResourceType())){ - rmMonitorPolicy.setDeployDevice(String.join(",", clientArr)); - } - } +// String clientIds = rmMonitorPolicy.getDeployDevice(); +// if(clientIds != null){ +// String[] clientArr = clientIds.split("\n"); +// if(StringUtils.equals("switch",rmMonitorPolicy.getResourceType())){ +// List names = new ArrayList<>(); +// for (String clientId : clientArr) { +// // 根据clientId查询设备名称 +// String switchName = dataProcessUtil.getDeviceNameByClientId(clientId); +// names.add(switchName); +// } +// rmMonitorPolicy.setDeployDevice(String.join(",", names)); +// } +// if(StringUtils.equals("linux",rmMonitorPolicy.getResourceType())){ +// rmMonitorPolicy.setDeployDevice(String.join(",", clientArr)); +// } +// } if(rmMonitorPolicy.getResourceGroupId()!=null){ rmMonitorPolicy.setResourceGroupName(dataProcessUtil.getResourceGroupNameById(rmMonitorPolicy.getResourceGroupId())); } diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java index 3fa1ef1..e8ffa7d 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java @@ -189,7 +189,7 @@ public class ProcessSwitchCollectDataService { BigDecimal inDiff = switchInfo.getInBytes().subtract(tempInfo.getInBytes()); // 字节转为bit BigDecimal inDiffBit = inDiff.multiply(new BigDecimal(8)).setScale(0, RoundingMode.HALF_UP); - switchInfo.setInSpeed(inDiffBit.divide(divisor, 2, RoundingMode.HALF_UP)); + switchInfo.setInSpeed(inDiffBit.divide(divisor, 0, RoundingMode.HALF_UP)); } // 计算outSpeed @@ -197,7 +197,7 @@ public class ProcessSwitchCollectDataService { BigDecimal outDiff = switchInfo.getOutBytes().subtract(tempInfo.getOutBytes()); // 字节转为bit BigDecimal outDiffBit = outDiff.multiply(new BigDecimal(8)).setScale(0, RoundingMode.HALF_UP); - switchInfo.setOutSpeed(outDiffBit.divide(divisor, 2, RoundingMode.HALF_UP)); + switchInfo.setOutSpeed(outDiffBit.divide(divisor, 0, RoundingMode.HALF_UP)); } } });