xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：页面冗余属性

Browse Source
This commit is contained in:
nieziyan 2024-01-05 18:22:42 +08:00
parent fbf15e3c05
commit 8b9814b6d9
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/ServerDto.java
View File

@ -15,9 +15,7 @@ public class ServerDto implements Serializable {
private String hostId; private String hostId;
private boolean online; // 旧状态值 弃用 private boolean online;
private String status; // 新状态值
private String serverInfo; private String serverInfo;

6
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/enums/ServerStatus.java
View File

@ -7,11 +7,11 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
public enum ServerStatus { public enum ServerStatus {
UNKNOWN("-1", "未知"),ON("1","在线"),OFF("2","离线"),WARN("3","告警"); ON("1","在线"), OFF("2","离线"), WARN("3","告警");
private String value; private final String value;
private String desc; private final String desc;
public static ServerStatus statusOf(String value){ public static ServerStatus statusOf(String value){
for (ServerStatus status : ServerStatus.values()) { for (ServerStatus status : ServerStatus.values()) {

2
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/aspect/StatusAspect.java
View File

@ -136,7 +136,7 @@ public class StatusAspect {
Object[] args = point.getArgs(); Object[] args = point.getArgs();
if (ArrayUtil.length(args) == 0) return; if (ArrayUtil.length(args) == 0) return;
String key = RedisConstant.SERVER_STATUS; String key = RedisConstant.SERVER_STATUS;
String status = ServerStatus.UNKNOWN.getValue(); // 初始值为-1 String status = ServerStatus.OFF.getValue();
SysServer server = (SysServer) args[0]; SysServer server = (SysServer) args[0];
String id = server.getId(); String id = server.getId();
String name = server.getName(); String name = server.getName();

4
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
View File

@ -76,6 +76,8 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
boolean online = false; boolean online = false;
String id = databaseDto.getId(); String id = databaseDto.getId();
String type = databaseDto.getType(); String type = databaseDto.getType();
Integer alarms = databaseDto.getAlarms();
boolean alarmRed = ObjectUtil.isNotNull(alarms) && alarms > 0;
NameValue nameValue = (NameValue) statusMap.get(id); NameValue nameValue = (NameValue) statusMap.get(id);
if (ObjectUtil.isNotNull(nameValue)){ if (ObjectUtil.isNotNull(nameValue)){
Boolean value = nameValue.getValue(); Boolean value = nameValue.getValue();
@ -85,7 +87,7 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
String dataBaseType = dataSourceMap.get(type); String dataBaseType = dataSourceMap.get(type);
databaseDto.setDataBaseType(dataBaseType) databaseDto.setDataBaseType(dataBaseType)
.setOnline(online).setSlowQuery("328/s") .setOnline(online).setSlowQuery("328/s")
.setAlarmRed(true).setCpuUutilzation("35.8%") .setAlarmRed(alarmRed).setCpuUutilzation("35.8%")
.setMemoryUsage("55.8%").setDiskUsage("35.6%"); .setMemoryUsage("55.8%").setDiskUsage("35.6%");
} }
page.setRecords(databaseDtos); page.setRecords(databaseDtos);

4
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java
View File

@ -93,6 +93,8 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> i
boolean online = false; boolean online = false;
String capacity = "--"; String capacity = "--";
String id = emailDto.getId(); String id = emailDto.getId();
Integer alarms = emailDto.getAlarms();
boolean alarmRed = ObjectUtil.isNotNull(alarms) && alarms > 0;
NameValue nameValue = (NameValue) statusMap.get(id); NameValue nameValue = (NameValue) statusMap.get(id);
if (ObjectUtil.isNotNull(nameValue)){ if (ObjectUtil.isNotNull(nameValue)){
Boolean value = nameValue.getValue(); Boolean value = nameValue.getValue();
@ -102,7 +104,7 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> i
if (ObjectUtil.isNotNull(usage)) if (ObjectUtil.isNotNull(usage))
capacity = usage + "MB"; capacity = usage + "MB";
} }
emailDto.setOnline(online).setStoerCapacity(capacity).setStoerRed(true) emailDto.setOnline(online).setStoerCapacity(capacity).setAlarmRed(alarmRed)
.setToday(todayMap.getOrDefault(id, 0)) .setToday(todayMap.getOrDefault(id, 0))
.setYesterday(yestMap.getOrDefault(id, 0)) .setYesterday(yestMap.getOrDefault(id, 0))
.setWeekly(weekMap.getOrDefault(id, 0)); .setWeekly(weekMap.getOrDefault(id, 0));

20
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysServerServiceImpl.java
View File

@ -48,6 +48,9 @@ import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.jeecg.modules.base.enums.ServerStatus.OFF;
import static org.jeecg.modules.base.enums.ServerStatus.ON;
@Service("sysServerService") @Service("sysServerService")
@Slf4j @Slf4j
public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer> implements ISysServerService { public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer> implements ISysServerService {
@ -77,7 +80,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
List<Host> hosts = new ArrayList<>(); List<Host> hosts = new ArrayList<>();
try { try {
String token = ManageUtil.getToken(); String token = ManageUtil.getToken();
hosts = monitorAlarm.listOnApp(ServerStatus.ON.getValue(), MonitorConstant.SERVER_APP, hosts = monitorAlarm.listOnApp(ON.getValue(), MonitorConstant.SERVER_APP,
MonitorConstant.pageNo, MonitorConstant.pageSize, token).getResult().getRecords(); MonitorConstant.pageNo, MonitorConstant.pageSize, token).getResult().getRecords();
}catch (FeignException.Unauthorized e){ }catch (FeignException.Unauthorized e){
ManageUtil.refreshToken(); ManageUtil.refreshToken();
@ -97,13 +100,13 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
serverDto.setAlarmRed(alarms > 0); serverDto.setAlarmRed(alarms > 0);
// 设置服务器状态信息 // 设置服务器状态信息
NameValue nameValue = (NameValue) statusMap.get(id); NameValue nameValue = (NameValue) statusMap.get(id);
String status = ServerStatus.UNKNOWN.getValue(); String status = OFF.getValue();
if (ObjectUtil.isNotNull(nameValue)){ if (ObjectUtil.isNotNull(nameValue)){
String valueT = nameValue.getValueT(); String valueT = nameValue.getValueT();
if (StrUtil.isNotBlank(valueT)) if (StrUtil.isNotBlank(valueT))
status = valueT; status = valueT;
} }
serverDto.setStatus(status); boolean online = StrUtil.equals(status, ON.getValue());
// 设置服务器的硬件使用情况信息 // 设置服务器的硬件使用情况信息
Host host = hostMap.get(hostId); Host host = hostMap.get(hostId);
if (ObjectUtil.isNull(host)) if (ObjectUtil.isNull(host))
@ -121,12 +124,9 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
NumUtil.keepStr(memoryValue, 1) + "%"; NumUtil.keepStr(memoryValue, 1) + "%";
// 磁盘使用率 // 磁盘使用率
serverDto.setOnline(online).setCpuUutilzation(cpu)
serverDto.setOnline(true).setCpuUutilzation(cpu)
.setMemoryUsage(memory).setDiskUsage("--"); .setMemoryUsage(memory).setDiskUsage("--");
} }
// 统计Alarm总数
// int alarms = noPage.stream().mapToInt(ServerDto::getAlarms).sum();
page.setRecords(serverDtos); page.setRecords(serverDtos);
return Result.OK(page); return Result.OK(page);
} }
@ -266,7 +266,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
return Result.error("The Host To Be Queried Does Not Exist!"); return Result.error("The Host To Be Queried Does Not Exist!");
// 服务器是否在线 // 服务器是否在线
String status = host.getStatus(); String status = host.getStatus();
boolean online = StrUtil.equals(status, ServerStatus.ON.getValue()); boolean online = StrUtil.equals(status, ON.getValue());
Map<String, Item> items = host.getItems(); Map<String, Item> items = host.getItems();
Item empty; Item empty;
@ -383,7 +383,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
continue; continue;
} }
// 当前服务器不在监控服务器列表 将它的状态设置为未知 // 当前服务器不在监控服务器列表 将它的状态设置为未知
values.put(serverId, new NameValue(name, ServerStatus.UNKNOWN.getValue())); values.put(serverId, new NameValue(name, OFF.getValue()));
} }
redisUtil.hmset(key, values); redisUtil.hmset(key, values);
}catch (FeignException.Unauthorized e){ }catch (FeignException.Unauthorized e){
@ -412,7 +412,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
for (SysServer sysServer : sysServers) { for (SysServer sysServer : sysServers) {
String id = sysServer.getId(); String id = sysServer.getId();
String name = sysServer.getName(); String name = sysServer.getName();
values.put(id, new NameValue(name, ServerStatus.UNKNOWN.getValue())); values.put(id, new NameValue(name, OFF.getValue()));
} }
redisUtil.hmset(key, values); redisUtil.hmset(key, values);
} }