From 99cc962de01133b7c6f501983f2c9ca56ab81a5e Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Thu, 27 Apr 2023 20:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java  | 2 +-
 .../service/majornetwork/Impl/EventAnalysisServiceImpl.java     | 2 ++
 .../event/service/majornetwork/Impl/TransientServiceImpl.java   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
index a5a531de7..43c35186f 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java
@@ -85,7 +85,7 @@ public class RmpEventDetailPO implements Serializable {
     private String sagsource;
 
     @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;
 
 
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
index 1de54b84e..164c997e4 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
@@ -39,6 +39,7 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.function.Function;
@@ -1511,6 +1512,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
             if (waveTypeVO.getLineId() != null) {
                 for (AreaLineInfoVO lineInfoVO : areaLineList) {
                     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.setLineId(lineInfoVO.getLineId());
                         waveTypeVO.setLineName(lineInfoVO.getLineName());
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
index a382dac46..c8700c5b4 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
@@ -413,7 +413,7 @@ public class TransientServiceImpl implements TransientService {
                     ||StringUtils.contains(item.getSubName(),searchValue)
                     ||StringUtils.contains(item.getIp(),searchValue)
                     ||StringUtils.contains(item.getLineName(),searchValue)
-                    ||StringUtils.contains(item.getVoltageScale(),searchValue))
+                    ||StringUtils.containsIgnoreCase(item.getVoltageScale(),searchValue))
                 return true;
         }
         return false;