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();

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -67,7 +68,13 @@ public class DataRecallController extends BaseController {
         List<String> guidList = new ArrayList<>();
         List<String> runMonitorIds = new ArrayList<>();
         List<RecallMessage.RecallDTO> recallDTOList = new ArrayList<>();
-
+//        Duration duration = Duration.between(param.getReCallStartTime(), param.getReCallEndTime());
+//        // 获取剩余的分钟数，如果要精确到分钟可以这样做
+//        long minutes = duration.toMinutes() ;
+//        if(minutes>60){
+//            throw new BusinessException("全量补招时间区间不能超过一个小时");
+//
+//        }
         if(CollectionUtils.isEmpty(param.getMonitorId())){
            throw new BusinessException("请选择监测点");
         }else {
@@ -251,6 +258,23 @@ public class DataRecallController extends BaseController {
         return start.format(formatter) + "~" + end.format(formatter);
     }
 
+    public static void main(String[] args) {
+            // 创建两个LocalDateTime对象
+            LocalDateTime dateTime1 = LocalDateTime.of(2023, 1, 1, 10, 0); // 例如：2023年1月1日 10:00
+            LocalDateTime dateTime2 = LocalDateTime.of(2023, 1, 2, 15, 30); // 例如：2023年1月1日 15:30
+
+            // 使用Duration计算两个时间之间的差异
+            Duration duration = Duration.between(dateTime1, dateTime2);
+
+
+
+            // 获取剩余的分钟数，如果要精确到分钟可以这样做
+            long minutes = duration.toMinutes() ;
+
+            // 输出结果
+            System.out.println("时间差（分钟）: " + minutes);
+
+    }
 
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/job/DataRecallJob.java

@@ -1,35 +0,0 @@
-package com.njcn.dataProcess.job;
-
-import com.njcn.dataProcess.controller.DataRecallController;
-import com.njcn.message.message.RecallMessage;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-
-/**
- * Description:
- * Date: 2025/07/24  下午 2:22【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Component
-@EnableScheduling
-@RequiredArgsConstructor
-@Slf4j
-public class DataRecallJob {
-    private final DataRecallController dataRecallController;
-    @Scheduled(cron="0 50 14 * * ?")
-    public void executeHours() {
-        RecallMessage param = new RecallMessage();
-        param.setReCallStartTime(LocalDate.now().minusDays(1));
-        param.setReCallEndTime(LocalDate.now());
-        dataRecallController.recall(param);
-    }
-}