1、优化告警信息展示。
2、搜索栏增加备注搜索模糊查询。
This commit is contained in:
@@ -1697,28 +1697,15 @@ public class MessageHandler {
|
||||
rmAlarmLog.setAlarmType("2");
|
||||
alarmContent = switchName + "下线";
|
||||
} else {
|
||||
// 查询管理网公网ip
|
||||
RmNetworkInterface rmNetworkInterface = new RmNetworkInterface();
|
||||
rmNetworkInterface.setClientId(clientId);
|
||||
rmNetworkInterface.setNewFlag(1);
|
||||
List<RmNetworkInterface> interfaceList = rmNetworkInterfaceService.selectRmNetworkInterfaceList(rmNetworkInterface);
|
||||
if (interfaceList != null && !interfaceList.isEmpty()) {
|
||||
interfaceList.stream()
|
||||
.filter(info -> "2".equals(info.getBindIp()) || "3".equals(info.getBindIp()))
|
||||
.findFirst()
|
||||
.ifPresent(networkInterface -> {
|
||||
rmAlarmLog.setMgmPublicIp(networkInterface.getPublicIp());
|
||||
});
|
||||
}
|
||||
// 查询业务名称
|
||||
// 查询服务器信息
|
||||
RmResourceRegistrationRemote query = new RmResourceRegistrationRemote();
|
||||
query.setClientId(clientId);
|
||||
R<RmResourceRegistrationRemote> registrationR = remoteRevenueConfigService.getListByHardwareSn(query, SecurityConstants.INNER);
|
||||
if(registrationR != null){
|
||||
RmResourceRegistrationRemote registrationMsg = registrationR.getData();
|
||||
if(registrationMsg != null){
|
||||
rmAlarmLog.setBusinessName(registrationMsg.getBusinessName());
|
||||
}
|
||||
R<RmResourceRegistrationRemote> registerMsgR = remoteRevenueConfigService.getListByHardwareSn(query, SecurityConstants.INNER);
|
||||
if(registerMsgR != null && registerMsgR.getData() != null){
|
||||
RmResourceRegistrationRemote serverMsg = registerMsgR.getData();
|
||||
rmAlarmLog.setMgmPublicIp(serverMsg.getIp1PublicIp());
|
||||
rmAlarmLog.setBusinessName(serverMsg.getBusinessName());
|
||||
rmAlarmLog.setRemark(serverMsg.getRemark());
|
||||
}
|
||||
rmAlarmLog.setClientId(clientId);
|
||||
rmAlarmLog.setAlarmType("1");
|
||||
|
||||
Reference in New Issue
Block a user