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

底层bit流量不保留小数、服务器监控策略clientId换行分割

Browse Source
This commit is contained in:
gaoyutao
2025-11-07 18:19:51 +08:00
parent a5b304c809
commit 4d1503e988
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/handler/MessageHandler.java
+2 -2
View File
@@ -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);
}
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java
+16 -17
View File
@@ -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<String> 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<String> 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()));
}
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/snmp/service/ProcessSwitchCollectDataService.java
+2 -2
View File
@@ -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));
}
}
});