Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改getDeviceLogData

Browse Source
This commit is contained in:
陈超
2022-07-07 21:53:52 +08:00
parent 04c8ad138f
commit 18a6c2637a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/LogManageServiceImpl.java
View File

@@ -27,6 +27,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -65,6 +66,9 @@ public class LogManageServiceImpl implements LogManageService {
if (!CollectionUtils.isEmpty(pageLogs)) { if (!CollectionUtils.isEmpty(pageLogs)) {
for (TerminalLogs logs: pageLogs) { for (TerminalLogs logs: pageLogs) {
DeviceLogVO deviceLogVO = logManageMapper.getDeviceLogData(logs.getLineId(), logs.getTerminalType(), logs.getUpdateBy()); DeviceLogVO deviceLogVO = logManageMapper.getDeviceLogData(logs.getLineId(), logs.getTerminalType(), logs.getUpdateBy());
if (Objects.isNull(deviceLogVO)) {
continue;
}
LocalDateTime localDateTime = LocalDateTime.ofInstant(logs.getTimeId(), ZoneId.systemDefault()); LocalDateTime localDateTime = LocalDateTime.ofInstant(logs.getTimeId(), ZoneId.systemDefault());
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
String time = dateTimeFormatter.format(localDateTime); String time = dateTimeFormatter.format(localDateTime);
@@ -72,10 +76,10 @@ public class LogManageServiceImpl implements LogManageService {
deviceLogVO.setRemark(logs.getTerminalDescribe()); deviceLogVO.setRemark(logs.getTerminalDescribe());
logData.add(deviceLogVO); logData.add(deviceLogVO);
} }
}
//当前页数据 //当前页数据
page.setRecords(logData); page.setRecords(logData);
} }
}
return page; return page;
} }
@@ -102,13 +106,16 @@ public class LogManageServiceImpl implements LogManageService {
for (EventPushLogs pushLogs: eventPushLogs) { for (EventPushLogs pushLogs: eventPushLogs) {
for (EventDetail eventDetail: eventDetailData) { for (EventDetail eventDetail: eventDetailData) {
if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getTimeId())) { if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getTimeId())) {
EventLogVO event = logManageMapper.getEventLogData(pushLogs.getLineId());
if (Objects.isNull(event)) {
continue;
}
EventLogVO eventLogVO = new EventLogVO(); EventLogVO eventLogVO = new EventLogVO();
eventLogVO.setLineId(pushLogs.getLineId()); eventLogVO.setLineId(pushLogs.getLineId());
LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault()); LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault());
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
String format = dateTimeFormatter.format(localDateTime); String format = dateTimeFormatter.format(localDateTime);
eventLogVO.setTime(format); eventLogVO.setTime(format);
EventLogVO event = logManageMapper.getEventLogData(eventLogVO.getLineId());
eventLogVO.setLine(event.getLine()); eventLogVO.setLine(event.getLine());
eventLogVO.setSubstation(event.getSubstation()); eventLogVO.setSubstation(event.getSubstation());
eventLogVO.setPowerCompany(event.getPowerCompany()); eventLogVO.setPowerCompany(event.getPowerCompany());
@@ -131,14 +138,13 @@ public class LogManageServiceImpl implements LogManageService {
eventLogVO.setUpdateTime(pushLogs.getUpdateTime()); eventLogVO.setUpdateTime(pushLogs.getUpdateTime());
list.add(eventLogVO); list.add(eventLogVO);
}
}
}
}
//当前页数据 //当前页数据
page.setRecords(list); page.setRecords(list);
} }
}
}
}
}
return page; return page;
} }