Merge remote-tracking branch 'origin/master'

analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java

@@ -92,7 +92,10 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
             if(Objects.equals(DataTypeEnum.HARMONIC.getCode(),dataType)){
                 MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class);
                 LocalDateTime localDateTime = messageHarmonicDataSet.getTIME();
-
+                //排除上电下电等情况前置上送上不是整分的数据
+                if(!(localDateTime.getSecond() == 0)){
+                    return;
+                }
                 Integer flag = messageHarmonicDataSet.getFLAG();
                 MessageP pq = messageHarmonicDataSet.getPQ();
                 MessageV v = messageHarmonicDataSet.getV();
@@ -384,6 +387,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)){
+                    return;
+                }
                 Integer flag = messageFlucDataSet.getFLAG();
                 MessageFs fs = messageFlucDataSet.getFs();
                 //短时闪变ABC
@@ -458,6 +464,9 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
                 LocalDateTime localDateTime = messagePltDataSet.getTIME();
                 Integer flag = messagePltDataSet.getFLAG();
                 MessageFl fl = messagePltDataSet.getFl();
+                if(!(localDateTime.getSecond() == 0)){
+                    return;
+                }
                 //长时闪变ABC
                 if(Objects.nonNull(fl)){
                     MessagePlt a = fl.getA();