From 38ccaf43367c8ce7a49ed882a858c752d8bb857e 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 15:21:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4pms=E5=9B=BD=E7=BD=91?= =?UTF-8?q?=E4=B8=8A=E9=80=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dim/IRDimBusGlobalDController.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 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 bbc3c58c0..6808fbd5f 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 @@ -1,29 +1,34 @@ package com.njcn.prepare.harmonic.controller.dim; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.prepare.harmonic.api.liteflow.LiteFlowFeignClient; +import com.njcn.prepare.harmonic.pojo.bo.BaseParam; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; import com.njcn.prepare.harmonic.service.mysql.dim.*; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.web.controller.BaseController; +import com.njcn.web.pojo.annotation.DateTimeStrValid; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.util.List; @@ -60,6 +65,8 @@ public class IRDimBusGlobalDController extends BaseController { private final DeptFeignClient deptFeignClient; + private final LiteFlowFeignClient liteFlowFeignClient; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/dayDimGlobal") @ApiOperation("母线变电站每日运行情况统计") @@ -124,4 +131,26 @@ public class IRDimBusGlobalDController extends BaseController { } + + /** + * 重新计算四个算法 + * @author cdf + * @date 2024/2/22 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/reCalUploadAlgorithm") + @ApiOperation("重新计算四个算法") + @ApiImplicitParam(name = "statisticDate", value = "重新计算的日期", required = true) + public HttpResult 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); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + }