From a79e468d7d9ecedd0a9e8693a4f0ffb6625101f0 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 3 Apr 2024 11:30:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=E4=B8=8A=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PqTypicalSourceCreatePOServiceImpl.java   |  4 ++--
 .../impl/PointStatisticalDataServiceImpl.java      |  6 ++----
 .../upload/impl/REvaluationDataServiceImpl.java    |  7 ++-----
 .../RSubstationStatisticalDataServiceImpl.java     |  5 ++---
 .../timer/tasks/PqTypicalSourceTaskMRunner.java    |  3 +++
 .../timer/tasks/PqTypicalSourceTaskRunner.java     | 14 ++++++++++++++
 .../timer/tasks/UploadGwTaskEvaluationMRunner.java |  1 +
 .../timer/tasks/UploadGwTaskEvaluationRunner.java  | 14 ++++++++++++++
 .../system/timer/tasks/UploadGwTaskMRunner.java    |  1 +
 .../system/timer/tasks/UploadGwTaskRunner.java     | 12 ++++++++++++
 .../timer/tasks/UploadGwTaskSubstationMRunner.java |  1 +
 .../timer/tasks/UploadGwTaskSubstationRunner.java  | 14 +++++++++++++-
 12 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
index 1d75bebaf..38057f521 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java
@@ -134,7 +134,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
         //(预防之前送上过,修改数据后需要再次上送)
         if (CollectionUtil.isNotEmpty(uploadParam.getList())){
             list = this.lambdaQuery()
-                    .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
+                    .eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
                     .in(PqTypicalSourceCreatePO::getId,uploadParam.getList())
                     .isNotNull(PqTypicalSourceCreatePO::getComputeDate)
                     .in(PqTypicalSourceCreatePO::getStatisticalLevel,Stream.of("3","4").collect(Collectors.toList()))
@@ -143,7 +143,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
         //未指定数据上送,则将所有未上送的数据,上送上去
         else {
             list = this.lambdaQuery()
-                    .eq(PqTypicalSourceCreatePO::getStatisticalDate,uploadParam.getTime())
+                    .eq(PqTypicalSourceCreatePO::getComputeDate,uploadParam.getTime())
                     .eq(PqTypicalSourceCreatePO::getIsUploadHead,0)
                     .isNotNull(PqTypicalSourceCreatePO::getComputeDate)
                     .in(PqTypicalSourceCreatePO::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
index 1d3da971b..f594a3bbf 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PointStatisticalDataServiceImpl.java
@@ -80,17 +80,15 @@ public class PointStatisticalDataServiceImpl extends ServiceImpl<RUploadPointSta
         //(预防之前上送过,修改数据后需要再次上送)
         if (CollUtil.isNotEmpty(param.getList())){
             list = this.lambdaQuery()
-                    .eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
+                    .eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
                     .in(RUploadPointStatisticalDataD::getId,param.getList())
-                    .isNotNull(RUploadPointStatisticalDataD::getComputeDate)
                     .list();
         }
         //未指定数据上送,则上送省级数据
         else {
             list = this.lambdaQuery()
-                    .eq(RUploadPointStatisticalDataD::getStatisticalDate,param.getTime())
+                    .eq(RUploadPointStatisticalDataD::getComputeDate,param.getTime())
                     .eq(RUploadPointStatisticalDataD::getUploadStatus,0)
-                    .isNotNull(RUploadPointStatisticalDataD::getComputeDate)
                     .in(RUploadPointStatisticalDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
                     .list();
         }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
index 5e4b09d2b..f6692fd66 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
@@ -95,17 +95,14 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
         //(预防之前上送过,修改数据后需要再次上送)
         if (CollUtil.isNotEmpty(param.getList())){
             list = this.lambdaQuery()
-                    .eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
+                    .eq(RUploadEvaluationDataD::getComputeDate,param.getTime())
                     .in(RUploadEvaluationDataD::getId,param.getList())
-                    .isNotNull(RUploadEvaluationDataD::getComputeDate)
                     .list();
         }
         //未指定数据上送,则上送省级数据(包含日、月数据)
         else {
             list = this.lambdaQuery()
-                    .eq(RUploadEvaluationDataD::getStatisticalDate,param.getTime())
-                    .eq(RUploadEvaluationDataD::getUploadStatus,0)
-                    .isNotNull(RUploadEvaluationDataD::getComputeDate)
+                    .eq(RUploadEvaluationDataD::getComputeDate,param.getTime())
                     .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList()))
                     .list();
         }
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
index b3fe26eb8..6dbe2dc2f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RSubstationStatisticalDataServiceImpl.java
@@ -82,10 +82,9 @@ public class RSubstationStatisticalDataServiceImpl extends ServiceImpl<RUploadSu
         else {
             list = this.lambdaQuery()
                     .eq(RUploadSubstationStatisticalDataD::getStatisticalDate,param.getTime())
-                    .eq(RUploadSubstationStatisticalDataD::getUploadStatus,0)
-                    .eq(RUploadSubstationStatisticalDataD::getCityId,"")
+                    //.eq(RUploadSubstationStatisticalDataD::getCityId,"")
                     .isNotNull(RUploadSubstationStatisticalDataD::getComputeDate)
-                    //.eq(RUploadSubstationStatisticalDataD::getCountyId,"")
+                    .eq(RUploadSubstationStatisticalDataD::getCountyId,"")
                     .list();
         }
         //以尺寸100分片
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java
index 1c53c580f..b5ce909d5 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskMRunner.java
@@ -15,6 +15,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @RequiredArgsConstructor
+@Deprecated
 public class PqTypicalSourceTaskMRunner implements TimerTaskRunner {
 
     private final PqTypicalSourceFeignClient pqTypicalSourceFeignClient;
@@ -22,6 +23,8 @@ public class PqTypicalSourceTaskMRunner implements TimerTaskRunner {
 
     @Override
     public void action(String date) {
+
+
         //月
         UploadParam param=new UploadParam();
         param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java
index 3f4e7f373..5b5c2870e 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java
@@ -29,5 +29,19 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner {
         if(code.equals("A0002")){
             throw new BusinessException("失败");
         }
+
+
+        //月
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
+        String codeM = pqTypicalSourceFeignClient.send(param).getCode();
+        if(codeM.equals("A0002")){
+            throw new BusinessException("失败");
+        }
+        //年
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
+        String code2 = pqTypicalSourceFeignClient.send(param).getCode();
+        if(code2.equals("A0002")){
+            throw new BusinessException("失败");
+        }
     }
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java
index a8c1a52ca..a7b11b3d8 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationMRunner.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @RequiredArgsConstructor
+@Deprecated
 public class UploadGwTaskEvaluationMRunner implements TimerTaskRunner {
 
     private final UploadGwDataFeignClient uploadGwDataFeignClient;
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java
index f707f7ff3..24480cc66 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskEvaluationRunner.java
@@ -30,5 +30,19 @@ public class UploadGwTaskEvaluationRunner implements TimerTaskRunner {
         if(code.equals("A0002")){
             throw new BusinessException("失败");
         }
+
+
+        //月
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
+        String codeM = uploadGwDataFeignClient.uploadEvaluationData(param).getCode();
+        if(codeM.equals("A0002")){
+            throw new BusinessException("失败");
+        }
+        //年
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
+        String code2 = uploadGwDataFeignClient.uploadEvaluationData(param).getCode();
+        if(code2.equals("A0002")){
+            throw new BusinessException("失败");
+        }
     }
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java
index 9561c57a2..e238cee5d 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskMRunner.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @RequiredArgsConstructor
+@Deprecated
 public class UploadGwTaskMRunner implements TimerTaskRunner {
 
     private final UploadGwDataFeignClient uploadGwDataFeignClient;
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java
index 387a09fe0..9fbc419e2 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskRunner.java
@@ -30,5 +30,17 @@ public class UploadGwTaskRunner implements TimerTaskRunner {
         if(code.equals("A0002")){
             throw new BusinessException("失败");
         }
+
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
+        String codeM = uploadGwDataFeignClient.uploadPointStatisticalData(param).getCode();
+        if(codeM.equals("A0002")){
+            throw new BusinessException("失败");
+        }
+        //年
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
+        String codeY = uploadGwDataFeignClient.uploadPointStatisticalData(param).getCode();
+        if(codeY.equals("A0002")){
+            throw new BusinessException("失败");
+        }
     }
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java
index b77ef5b35..e3834c5b7 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationMRunner.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 @RequiredArgsConstructor
+@Deprecated
 public class UploadGwTaskSubstationMRunner implements TimerTaskRunner {
 
     private final UploadGwDataFeignClient uploadGwDataFeignClient;
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java
index 995cc307b..63772a367 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java
@@ -25,10 +25,22 @@ public class UploadGwTaskSubstationRunner implements TimerTaskRunner {
     @Override
     public void action(String date) {
         UploadParam param = new UploadParam();
-        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+        /*param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
         String code = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode();
         if(code.equals("A0002")){
             throw new BusinessException("失败");
         }
+*/
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_MONTH_PATTERN));
+        String codeM = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode();
+        if(codeM.equals("A0002")){
+            throw new BusinessException("失败");
+        }
+        //年
+        param.setTime(DateUtil.yesterday().toString(DatePattern.NORM_YEAR_PATTERN));
+        String code2 = uploadGwDataFeignClient.uploadSubstationStatisticalData(param).getCode();
+        if(code2.equals("A0002")){
+            throw new BusinessException("失败");
+        }
     }
 }