From 45417cbecf60d059c3866c7ed6f7464fa9c895cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 31 Mar 2023 08:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E9=AB=98=E5=8E=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/web/utils/ComAssesUtil.java | 2 +- .../pq/controller/LargeScreenController.java | 4 +- .../pq/controller/TerminalBaseController.java | 60 +++++++++++++++++++ 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java index 7050190b8..e3ae32e17 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/ComAssesUtil.java @@ -87,7 +87,7 @@ public class ComAssesUtil { if (getBysxf()) { //G和F得出综合权重A if (getZhqzf()) { - //A[0] = 0.28;A[1] = 0.23;A[2] = 0.13;A[3] = 0.16;A[4] = 0.08;A[5] = 0.12; + A[0] = 0.28f;A[1] = 0.23f;A[2] = 0.13f;A[3] = 0.16f;A[4] = 0.08f;A[5] = 0.12f; for (i = 0; i < GRADE_NUM; i++) { B[i] = 0; for (j = 0; j < ST_QT_NUM; j++) { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java index 69bf53884..ab9de1877 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java @@ -53,10 +53,10 @@ public class LargeScreenController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLoadType") @ApiOperation("监测点规模(负荷类型)") - @ApiImplicitParam(name = "getLoadType", value = "监测点规模(负荷类型)", required = true) + @ApiImplicitParam(name = "largeScreenParam", value = "监测点规模(负荷类型)", required = true) public HttpResult getLoadType(@RequestBody @Validated LargeScreenParam largeScreenParam) { String methodDescribe = getMethodDescribe("getLoadType"); MonitoringPointScaleVO result = largeScreenService.getLoadType(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } -} \ No newline at end of file +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java index 3e1ffebe0..fb99708cd 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java @@ -3,6 +3,7 @@ package com.njcn.device.pq.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -12,14 +13,23 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.pq.enums.DeviceResponseEnum; +import com.njcn.device.pq.mapper.LineDetailMapper; +import com.njcn.device.pq.mapper.LineMapper; +import com.njcn.device.pq.mapper.OverlimitMapper; +import com.njcn.device.pq.mapper.VoltageMapper; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel; import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.Line; +import com.njcn.device.pq.pojo.po.LineDetail; +import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.pq.pojo.po.Voltage; import com.njcn.device.pq.pojo.vo.TerminalBaseVO; import com.njcn.device.pq.pojo.vo.TerminalVO; import com.njcn.device.pq.service.TerminalBaseService; import com.njcn.poi.util.PoiUtil; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.pojo.po.DictData; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,6 +41,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.ArrayList; @@ -54,6 +65,22 @@ public class TerminalBaseController extends BaseController { private final TerminalBaseService terminalBaseService; + + private final LineDetailMapper lineDetailMapper; + + + private final OverlimitMapper overlimitMapper; + + + private final DicDataFeignClient dicDataFeignClient; + + + private final LineMapper lineMapper; + + + private final VoltageMapper voltageMapper; + + /** * 终端新增操作 * @@ -272,4 +299,37 @@ public class TerminalBaseController extends BaseController { } + + /** + * 重新计算限值 + * + * @author cdf + * @date 2022/5/17 + */ + @ApiOperation("监测点-重新计算限值") + @GetMapping(value = "updatePqOverLimit") + public HttpResult updatePqOverLimit() { + String methodDescribe = getMethodDescribe("updatePqOverLimit"); + + List lineDetailList = lineDetailMapper.selectList(new LambdaQueryWrapper<>()); + + int count = 0; + for(LineDetail lineDetail:lineDetailList){ + overlimitMapper.deleteById(lineDetail.getId()); + Line line = lineMapper.selectById(lineDetail.getId()); + if(Objects.nonNull(line)) { + Voltage voltage = voltageMapper.selectById(line.getPid()); + //监测点限值 + HttpResult scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()); + if (Objects.isNull(scaleResult.getData())) { + throw new BusinessException(CommonResponseEnum.DIC_DATA); + } + Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getName(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); + overlimitMapper.insert(overlimit); + count++; + } + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, count, methodDescribe); + } + }