fix：页面冗余属性
This commit is contained in:
nieziyan
parent
fbf15e3c05
commit
8b9814b6d9
|
|
@ -15,9 +15,7 @@ public class ServerDto implements Serializable {
|
|||
|
||||
private String hostId;
|
||||
|
||||
private boolean online; // 旧状态值 弃用
|
||||
|
||||
private String status; // 新状态值
|
||||
private boolean online;
|
||||
|
||||
private String serverInfo;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ import lombok.Getter;
|
|||
@AllArgsConstructor
|
||||
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){
|
||||
for (ServerStatus status : ServerStatus.values()) {
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ public class StatusAspect {
|
|||
Object[] args = point.getArgs();
|
||||
if (ArrayUtil.length(args) == 0) return;
|
||||
String key = RedisConstant.SERVER_STATUS;
|
||||
String status = ServerStatus.UNKNOWN.getValue(); // 初始值为-1
|
||||
String status = ServerStatus.OFF.getValue();
|
||||
SysServer server = (SysServer) args[0];
|
||||
String id = server.getId();
|
||||
String name = server.getName();
|
||||
|
|
|
|||
|
|
@ -76,6 +76,8 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
|
|||
boolean online = false;
|
||||
String id = databaseDto.getId();
|
||||
String type = databaseDto.getType();
|
||||
Integer alarms = databaseDto.getAlarms();
|
||||
boolean alarmRed = ObjectUtil.isNotNull(alarms) && alarms > 0;
|
||||
NameValue nameValue = (NameValue) statusMap.get(id);
|
||||
if (ObjectUtil.isNotNull(nameValue)){
|
||||
Boolean value = nameValue.getValue();
|
||||
|
|
@ -85,7 +87,7 @@ public class SysDatabaseServiceImpl extends ServiceImpl<SysDatabaseMapper, SysDa
|
|||
String dataBaseType = dataSourceMap.get(type);
|
||||
databaseDto.setDataBaseType(dataBaseType)
|
||||
.setOnline(online).setSlowQuery("328/s")
|
||||
.setAlarmRed(true).setCpuUutilzation("35.8%")
|
||||
.setAlarmRed(alarmRed).setCpuUutilzation("35.8%")
|
||||
.setMemoryUsage("55.8%").setDiskUsage("35.6%");
|
||||
}
|
||||
page.setRecords(databaseDtos);
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> i
|
|||
boolean online = false;
|
||||
String capacity = "--";
|
||||
String id = emailDto.getId();
|
||||
Integer alarms = emailDto.getAlarms();
|
||||
boolean alarmRed = ObjectUtil.isNotNull(alarms) && alarms > 0;
|
||||
NameValue nameValue = (NameValue) statusMap.get(id);
|
||||
if (ObjectUtil.isNotNull(nameValue)){
|
||||
Boolean value = nameValue.getValue();
|
||||
|
|
@ -102,7 +104,7 @@ public class SysEmailServiceImpl extends ServiceImpl<SysEmailMapper, SysEmail> i
|
|||
if (ObjectUtil.isNotNull(usage))
|
||||
capacity = usage + "MB";
|
||||
}
|
||||
emailDto.setOnline(online).setStoerCapacity(capacity).setStoerRed(true)
|
||||
emailDto.setOnline(online).setStoerCapacity(capacity).setAlarmRed(alarmRed)
|
||||
.setToday(todayMap.getOrDefault(id, 0))
|
||||
.setYesterday(yestMap.getOrDefault(id, 0))
|
||||
.setWeekly(weekMap.getOrDefault(id, 0));
|
||||
|
|
|
|||
|
|
@ -48,6 +48,9 @@ import java.util.*;
|
|||
import java.util.concurrent.TimeUnit;
|
||||
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")
|
||||
@Slf4j
|
||||
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<>();
|
||||
try {
|
||||
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();
|
||||
}catch (FeignException.Unauthorized e){
|
||||
ManageUtil.refreshToken();
|
||||
|
|
@ -96,14 +99,14 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
|
|||
String hostId = serverDto.getHostId();
|
||||
serverDto.setAlarmRed(alarms > 0);
|
||||
// 设置服务器状态信息
|
||||
NameValue nameValue = (NameValue)statusMap.get(id);
|
||||
String status = ServerStatus.UNKNOWN.getValue();
|
||||
NameValue nameValue = (NameValue) statusMap.get(id);
|
||||
String status = OFF.getValue();
|
||||
if (ObjectUtil.isNotNull(nameValue)){
|
||||
String valueT = nameValue.getValueT();
|
||||
if (StrUtil.isNotBlank(valueT))
|
||||
status = valueT;
|
||||
}
|
||||
serverDto.setStatus(status);
|
||||
boolean online = StrUtil.equals(status, ON.getValue());
|
||||
// 设置服务器的硬件使用情况信息
|
||||
Host host = hostMap.get(hostId);
|
||||
if (ObjectUtil.isNull(host))
|
||||
|
|
@ -121,12 +124,9 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
|
|||
NumUtil.keepStr(memoryValue, 1) + "%";
|
||||
// 磁盘使用率
|
||||
|
||||
|
||||
serverDto.setOnline(true).setCpuUutilzation(cpu)
|
||||
serverDto.setOnline(online).setCpuUutilzation(cpu)
|
||||
.setMemoryUsage(memory).setDiskUsage("--");
|
||||
}
|
||||
// 统计Alarm总数
|
||||
// int alarms = noPage.stream().mapToInt(ServerDto::getAlarms).sum();
|
||||
page.setRecords(serverDtos);
|
||||
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!");
|
||||
// 服务器是否在线
|
||||
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();
|
||||
Item empty;
|
||||
|
|
@ -383,7 +383,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
|
|||
continue;
|
||||
}
|
||||
// 当前服务器不在监控服务器列表 将它的状态设置为未知
|
||||
values.put(serverId, new NameValue(name, ServerStatus.UNKNOWN.getValue()));
|
||||
values.put(serverId, new NameValue(name, OFF.getValue()));
|
||||
}
|
||||
redisUtil.hmset(key, values);
|
||||
}catch (FeignException.Unauthorized e){
|
||||
|
|
@ -412,7 +412,7 @@ public class SysServerServiceImpl extends ServiceImpl<SysServerMapper, SysServer
|
|||
for (SysServer sysServer : sysServers) {
|
||||
String id = sysServer.getId();
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user