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

问题单修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-27 20:14:32 +08:00
parent 542bdb39ec
commit 99cc962de0
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
View File

@@ -85,7 +85,7 @@ public class RmpEventDetailPO implements Serializable {
private String sagsource; private String sagsource;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS", timezone = "GMT+8")
private LocalDateTime startTime; private LocalDateTime startTime;

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
View File

@@ -39,6 +39,7 @@ import java.io.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.*; import java.util.*;
import java.util.function.Function; import java.util.function.Function;
@@ -1511,6 +1512,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
if (waveTypeVO.getLineId() != null) { if (waveTypeVO.getLineId() != null) {
for (AreaLineInfoVO lineInfoVO : areaLineList) { for (AreaLineInfoVO lineInfoVO : areaLineList) {
if (waveTypeVO.getLineId().equals(lineInfoVO.getLineId())) { if (waveTypeVO.getLineId().equals(lineInfoVO.getLineId())) {
waveTypeVO.setStartTime(record.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")));
waveTypeVO.setSubName(lineInfoVO.getSubName()); waveTypeVO.setSubName(lineInfoVO.getSubName());
waveTypeVO.setLineId(lineInfoVO.getLineId()); waveTypeVO.setLineId(lineInfoVO.getLineId());
waveTypeVO.setLineName(lineInfoVO.getLineName()); waveTypeVO.setLineName(lineInfoVO.getLineName());

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -413,7 +413,7 @@ public class TransientServiceImpl implements TransientService {
||StringUtils.contains(item.getSubName(),searchValue) ||StringUtils.contains(item.getSubName(),searchValue)
||StringUtils.contains(item.getIp(),searchValue) ||StringUtils.contains(item.getIp(),searchValue)
||StringUtils.contains(item.getLineName(),searchValue) ||StringUtils.contains(item.getLineName(),searchValue)
||StringUtils.contains(item.getVoltageScale(),searchValue)) ||StringUtils.containsIgnoreCase(item.getVoltageScale(),searchValue))
return true; return true;
} }
return false; return false;