1.pms国网上送算法链调整

2.调整pms国网上送功能

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/LiteFlowFeignClient.java

@@ -27,6 +27,11 @@ public interface LiteFlowFeignClient {
     @PostMapping("/orgPointExecutor")
     void orgPointExecutor(@RequestBody BaseParam baseParam);
 
+
+    @ApiOperation("pms国网上送单位层级算法执行链")
+    @PostMapping("/uploadOrgExecutor")
+    void uploadOrgExecutor(@RequestBody BaseParam baseParam);
+
     @ApiOperation("变电站算法执行链")
     @PostMapping("/substationExecutor")
     void substationExecutor(@RequestBody BaseParam baseParam);

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/fallback/LiteFlowFeignClientFallbackFactory.java

@@ -34,6 +34,12 @@ public class LiteFlowFeignClientFallbackFactory implements FallbackFactory<LiteF
                 throw new BusinessException(finalExceptionEnum);
             }
 
+            @Override
+            public void uploadOrgExecutor(BaseParam baseParam) {
+                log.error("{}异常，降级处理，异常为：{}", "pms国网上送单位层级算法执行链:  ", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
             @Override
             public void substationExecutor(BaseParam baseParam) {
                 log.error("{}异常，降级处理，异常为：{}", "变电站算法执行链:  ", throwable.toString());

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java

@@ -220,6 +220,45 @@ public class ExecutionCenter extends BaseController {
 
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("pms国网上送单位层级算法执行链")
+    @PostMapping("/uploadOrgExecutor")
+    @Async("asyncExecutor")
+    public void uploadOrgExecutor(@RequestBody BaseParam baseParam) {
+        String methodDescribe = getMethodDescribe("uploadOrgExecutor");
+        //手动判断参数是否合法,
+        CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = judgeExecuteParam(baseParam);
+        // 测点索引
+        DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
+
+        if (CollectionUtils.isEmpty(calculatedParam.getIdList())) {
+            Dept data = deptFeignClient.getRootDept().getData();
+            deptGetLineParam.setDeptId(data.getId());
+            calculatedParam.setIdList(commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData());
+        }
+        LiteflowResponse liteflowResponse;
+        if (baseParam.isRepair()) {
+            //补招时，起始日期、截止日期必填
+            DateTime startDate = DateUtil.parse(baseParam.getBeginTime(), DatePattern.NORM_DATE_FORMAT);
+            DateTime endDate = DateUtil.parse(baseParam.getEndTime(), DatePattern.NORM_DATE_FORMAT);
+            long betweenDay = DateUtil.betweenDay(startDate, endDate, true);
+            //递增日期执行算法链
+            for (int i = 0; i < betweenDay; i++) {
+                if (i != 0) {
+                    startDate = DateUtil.offsetDay(startDate, 1);
+                }
+                calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN));
+                liteflowResponse = flowExecutor.execute2Resp("upload_org", calculatedParam);
+                dealResponse(calculatedParam, liteflowResponse, methodDescribe);
+            }
+        } else {
+            //非补招
+            liteflowResponse = flowExecutor.execute2Resp("upload_org", calculatedParam);
+            dealResponse(calculatedParam, liteflowResponse, methodDescribe);
+        }
+
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("变电站算法执行链")
     @PostMapping("/substationExecutor")

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java

@@ -0,0 +1,31 @@
+package com.njcn.system.timer.tasks;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient;
+import com.njcn.prepare.harmonic.pojo.bo.BaseParam;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/2/22
+ */
+@Component
+@RequiredArgsConstructor
+public class UploadGwOrgAllRunner implements TimerTaskRunner {
+
+    private final LiteFlowFeignClient liteFlowFeignClient;
+
+    @Override
+    public void action() {
+        BaseParam baseParam = new BaseParam();
+        baseParam.setFullChain(true);
+        baseParam.setRepair(false);
+        baseParam.setDataDate(DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN));
+        liteFlowFeignClient.uploadOrgExecutor(baseParam);
+    }
+}