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-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..44327c7 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 @@ -24,7 +24,9 @@ import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.Instant; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.temporal.ChronoField; import java.util.ArrayList; import java.util.List; @@ -92,7 +94,7 @@ 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; 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..eef6fcb 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,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.temporal.ChronoField; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -85,8 +87,11 @@ 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());; + //排除上电下电等情况前置上送上不是整分的数据 + if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){ + System.out.println(111111111); + } Integer flag = messageHarmonicDataSet.getFLAG(); MessageP pq = messageHarmonicDataSet.getPQ(); MessageV v = messageHarmonicDataSet.getV();