From c0cccc3479a7945dc55ed77e90b02e3ec0eacd5f Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 2 Apr 2026 09:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/csharmonic/service/impl/CustomReportServiceImpl.java | 3 +++
 .../src/main/java/com/njcn/cssystem/task/DataTask.java        | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java
index 8288b70..c910ef3 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CustomReportServiceImpl.java
@@ -286,6 +286,9 @@ public class CustomReportServiceImpl implements CustomReportService {
         DictData gridSideDictData = dicDataFeignClient.getDicDataByCode(GRID_SIDE_DICT_CODE).getData();
         CsLinePO gridSideLine = linePOList.stream().filter(linePO -> linePO.getPosition().equals(gridSideDictData.getId())).findFirst().orElse(null);
         CsLinePO loadSideLine = linePOList.stream().filter(linePO -> linePO.getPosition().equals(loadSideDictData.getId())).findFirst().orElse(null);
+        if(Objects.isNull(gridSideLine) || Objects.isNull(loadSideLine)) {
+            throw new BusinessException("电网侧与负载侧监测点缺失，无法生成报告!");
+        }
 
         String tempId = getTempId(queryParam.getTempId(), Objects.isNull(gridSideLine)? loadSideLine.getLineId():gridSideLine.getLineId());
 
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/task/DataTask.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/task/DataTask.java
index 6e65285..ebb79ed 100644
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/task/DataTask.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/task/DataTask.java
@@ -20,13 +20,13 @@ public class DataTask {
 
     private final IDataTaskService taskService;
 
-    @Scheduled(cron = "0 0 2 * * ?")
+    @Scheduled(cron = "0 0 4 * * ?")
     public void csHarmonicJob() {
         String date = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN);
         taskService.channelHarmonic(date);
     }
 
-    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 0 5 * * ?")
     public void csAlarmJob() {
         String date = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN);
         taskService.channelRunAlarm(date);