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

心跳监测内容修改，ip对应数据改为clientId对应硬件SN，监控模板，策略bug修改

Browse Source
This commit is contained in:
gaoyutao
2025-09-25 19:12:52 +08:00
parent 939d8d0286
commit cc9593b4bf
28 changed files with 1447 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/EpsServerRevenueConfigMapper.java
+7
View File
@@ -77,6 +77,13 @@ public interface EpsServerRevenueConfigMapper
* @return 服务器收益方式配置
*/
public Map getNodeMsgByIp(@Param("ipAddress") String ipAddress);
/**
* 根据sn查询服务器信息
*
* @param hardwareSn 硬件SN
* @return 服务器收益方式配置
*/
public Map getNodeMsgBySn(@Param("hardwareSn") String hardwareSn);
int updateEpsServerRevenueConfigByServerSn(EpsServerRevenueConfig epsServerRevenueConfig);
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsServerRevenueConfigServiceImpl.java
+2 -7
View File
@@ -173,13 +173,8 @@ public class EpsServerRevenueConfigServiceImpl implements IEpsServerRevenueConfi
List<EpsInitialTrafficData> dataList = epsInitialTrafficDataService.getAllTraficMsg(epsInitialTrafficData);
List<EpsInitialTrafficData> batchList = new ArrayList<>();
for (EpsInitialTrafficData initialTrafficData : dataList) {
// 根据ip查询节点名称
String ip = initialTrafficData.getIpV4() == null ? "" : initialTrafficData.getIpV4();
String mac = initialTrafficData.getMac() == null ? "" : initialTrafficData.getMac();
Map nodeMsg = epsServerRevenueConfigMapper.getNodeMsgByIp(ip);
if(nodeMsg == null){
nodeMsg = epsServerRevenueConfigMapper.getNodeMsgByIp(mac);
}
// 根据clientId查询节点名称
Map nodeMsg = epsServerRevenueConfigMapper.getNodeMsgBySn(initialTrafficData.getClientId());
// 赋值
if(nodeMsg != null){
initialTrafficData.setServiceSn(getNullableString(nodeMsg, "hardwareSn"));
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java
+2 -2
View File
@@ -134,10 +134,10 @@ public class InitialSwitchInfoDetailsServiceImpl implements IInitialSwitchInfoDe
details.setId(null);
// 根据接口名称查询交换机信息
String interfaceName = details.getName();
String switchIp = details.getSwitchIp();
String switchSn = details.getSwitchSn();
RmEpsTopologyManagement rmEpsTopologyManagement = new RmEpsTopologyManagement();
rmEpsTopologyManagement.setInterfaceName(interfaceName);
rmEpsTopologyManagement.setSwitchIpAddress(switchIp);
rmEpsTopologyManagement.setSwitchSn(switchSn);
List<RmEpsTopologyManagement> managements = rmEpsTopologyManagementMapper.selectRmEpsTopologyManagementList(rmEpsTopologyManagement);
// 赋值
if(!managements.isEmpty()){