From 2280037b28d1bd503b524ba62995d614adb5af27 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 24 Jul 2026 09:15:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/stat/messagedto/MessageFlucDataSet.java | 7 +++---- .../stat/messagedto/MessageHarmonicDataSet.java | 6 ++---- .../njcn/stat/messagedto/MessagePltDataSet.java | 7 +++---- .../service/impl/MessageAnalysisServiceImpl.java | 14 +++++++++----- .../controller/LnDataDealController.java | 3 ++- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageFlucDataSet.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageFlucDataSet.java index d8a1090..11239e8 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageFlucDataSet.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageFlucDataSet.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; import java.io.Serializable; +import java.time.Instant; import java.time.LocalDateTime; /** @@ -21,10 +22,8 @@ import java.time.LocalDateTime; @Data public class MessageFlucDataSet implements Serializable { private Integer FLAG; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime TIME; + private Instant TIME; + @JsonProperty("F_S") private MessageFs fs; diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java index 9503bf2..a44d872 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; import java.io.Serializable; +import java.time.Instant; import java.time.LocalDateTime; /** @@ -20,10 +21,7 @@ import java.time.LocalDateTime; @Data public class MessageHarmonicDataSet implements Serializable { private Integer FLAG; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS") - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime TIME; + private Instant TIME; private MessageV V; private MessageI I; private MessageP PQ; diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessagePltDataSet.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessagePltDataSet.java index e35be84..ae97584 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessagePltDataSet.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessagePltDataSet.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; import java.io.Serializable; +import java.time.Instant; import java.time.LocalDateTime; /** @@ -21,10 +22,8 @@ import java.time.LocalDateTime; @Data public class MessagePltDataSet implements Serializable { private Integer FLAG; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime TIME; + private Instant TIME; + @JsonProperty("F_L") private MessageFl fl; diff --git a/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java b/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java index cdd853a..e2faa93 100644 --- a/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java +++ b/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.temporal.ChronoField; import java.util.ArrayList; import java.util.List; @@ -92,7 +93,8 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService { String value = messageDataDTO.getValue(); if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)){ MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class); - LocalDateTime localDateTime = messageHarmonicDataSet.getTIME(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(messageHarmonicDataSet.getTIME(), ZoneId.systemDefault());; + //排除上电下电等情况前置上送上不是整分的数据 if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){ return; @@ -387,8 +389,9 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService { }else if(Objects.equals(DataTypeEnum.FLUC.getCode(),dataType)){ MessageFlucDataSet messageFlucDataSet = JSONObject.parseObject(value, MessageFlucDataSet.class); - LocalDateTime localDateTime = messageFlucDataSet.getTIME(); //LocalDateTime.ofInstant(messageFlucDataSet.getTIME(), ZoneId.systemDefault()).withNano(0).withSecond(0); - if(!(localDateTime.getSecond() == 0)){ + LocalDateTime localDateTime = LocalDateTime.ofInstant(messageFlucDataSet.getTIME(), ZoneId.systemDefault());; + + if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){ return; } Integer flag = messageFlucDataSet.getFLAG(); @@ -462,10 +465,11 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService { }else if(Objects.equals(DataTypeEnum.PLT.getCode(),dataType)){ MessagePltDataSet messagePltDataSet = JSONObject.parseObject(value, MessagePltDataSet.class); - LocalDateTime localDateTime = messagePltDataSet.getTIME(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(messagePltDataSet.getTIME(), ZoneId.systemDefault());; + Integer flag = messagePltDataSet.getFLAG(); MessageFl fl = messagePltDataSet.getFl(); - if(!(localDateTime.getSecond() == 0)){ + if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){ return; } //长时闪变ABC diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java index fc3875e..4da50fb 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/LnDataDealController.java @@ -28,6 +28,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -85,7 +86,7 @@ public class LnDataDealController extends BaseController { String value = messageDataDTO.getValue(); if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)) { MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class); - LocalDateTime localDateTime = messageHarmonicDataSet.getTIME(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(messageHarmonicDataSet.getTIME(), ZoneId.systemDefault());; Integer flag = messageHarmonicDataSet.getFLAG(); MessageP pq = messageHarmonicDataSet.getPQ();