From 5e27d90263edd84b0202864ad29e91904acfd837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 5 Mar 2024 13:59:42 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=B2=B3=E5=8C=97pms?=
 =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E4=B8=BB=E9=85=8D=E7=BD=91?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dim/IRDimBusGlobalDController.java        | 77 +++++++++++++++----
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java
index b9d068198..d0bda3fb2 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/dim/IRDimBusGlobalDController.java
@@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.controller.dim;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import java.time.LocalDate;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -143,23 +145,66 @@ public class IRDimBusGlobalDController extends BaseController {
     @GetMapping("/reCalUploadAlgorithm")
     @ApiOperation("重新计算四个算法")
     @ApiImplicitParam(name = "statisticDate", value = "重新计算的日期", required = true)
-    public HttpResult<String> reCalUploadAlgorithm(@DateTimeStrValid @RequestParam("statisticDate") String statisticDate) {
-
-        String methodDescribe = getMethodDescribe("uploadEvaluationData");
-        BaseParam baseParam = new BaseParam();
-        baseParam.setFullChain(true);
-        baseParam.setRepair(false);
-        baseParam.setDataDate(statisticDate);
-        liteFlowFeignClient.uploadOrgExecutor(baseParam);
-
-        BaseParam baseParamSub = new BaseParam();
-        baseParam.setFullChain(false);
-        baseParam.setRepair(false);
-        baseParam.setDataDate(statisticDate);
+    public HttpResult<String> reCalUploadAlgorithm(@DateTimeStrValid @RequestParam("statisticDate") String statisticDate,@RequestParam("type") String type) {
+        String methodDescribe = getMethodDescribe("reCalUploadAlgorithm");
         Set<String> set = new HashSet<>();
-        set.add("rUploadSubStatisticalData");
-        baseParam.setTagNames(set);
-        liteFlowFeignClient.substationExecutor(baseParam);
+        if(StrUtil.isBlank(type)){
+            BaseParam baseParam = new BaseParam();
+            baseParam.setFullChain(true);
+            baseParam.setRepair(false);
+            baseParam.setDataDate(statisticDate);
+            liteFlowFeignClient.uploadOrgExecutor(baseParam);
+
+            baseParam.setFullChain(false);
+            baseParam.setRepair(false);
+            baseParam.setDataDate(statisticDate);
+
+            set.add("r_upload_substation_statistical_data_d");
+            set.add("r_upload_substation_statistical_data_m");
+            baseParam.setTagNames(set);
+            liteFlowFeignClient.substationExecutor(baseParam);
+        }else if("0".equals(type)){
+            //基准
+            BaseParam baseParam = new BaseParam();
+            baseParam.setFullChain(false);
+            baseParam.setRepair(false);
+            set.add("r_upload_evaluation_data_d");
+            set.add("r_upload_evaluation_data_m");
+            baseParam.setDataDate(statisticDate);
+            baseParam.setTagNames(set);
+            liteFlowFeignClient.uploadOrgExecutor(baseParam);
+        }else if("1".equals(type)){
+            //主配网
+            BaseParam baseParam = new BaseParam();
+            baseParam.setFullChain(false);
+            baseParam.setRepair(false);
+            set.add("r_upload_point_statistical_data_d");
+            set.add("r_upload_point_statistical_data_m");
+            baseParam.setDataDate(statisticDate);
+            baseParam.setTagNames(set);
+            liteFlowFeignClient.uploadOrgExecutor(baseParam);
+        }else if("2".equals(type)){
+            //电站
+            BaseParam baseParam = new BaseParam();
+            baseParam.setFullChain(false);
+            baseParam.setRepair(false);
+            set.add("r_upload_substation_statistical_data_d");
+            set.add("r_upload_substation_statistical_data_m");
+            baseParam.setDataDate(statisticDate);
+            baseParam.setTagNames(set);
+            liteFlowFeignClient.substationExecutor(baseParam);
+        }else if("3".equals(type)){
+            //典型
+            BaseParam baseParam = new BaseParam();
+            baseParam.setFullChain(false);
+            baseParam.setRepair(false);
+            set.add("pq_typical_source_create_d");
+            set.add("pq_typical_source_create_m");
+            baseParam.setDataDate(statisticDate);
+            baseParam.setTagNames(set);
+            liteFlowFeignClient.uploadOrgExecutor(baseParam);
+        }
+
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }