From 17ef2d52727c0a190acdd7fff7a316c03991e12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 22 Feb 2024 13:49:57 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?= =?UTF-8?q?=E7=AE=97=E6=B3=95=E9=93=BE=E8=B0=83=E6=95=B4=202.=E8=B0=83?= =?UTF-8?q?=E6=95=B4pms=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/liteflow/LiteFlowFeignClient.java | 5 +++ .../LiteFlowFeignClientFallbackFactory.java | 6 +++ .../com/njcn/prepare/ExecutionCenter.java | 39 +++++++++++++++++++ .../timer/tasks/UploadGwOrgAllRunner.java | 31 +++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/LiteFlowFeignClient.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/LiteFlowFeignClient.java index cc7c08125..9be22e5ec 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/LiteFlowFeignClient.java +++ b/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); diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/fallback/LiteFlowFeignClientFallbackFactory.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/fallback/LiteFlowFeignClientFallbackFactory.java index 2fcaf6490..02ab7a03b 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/liteflow/fallback/LiteFlowFeignClientFallbackFactory.java +++ b/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 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") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java b/pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwOrgAllRunner.java new file mode 100644 index 000000000..eba909ffe --- /dev/null +++ b/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); + } +}