From 4cbf39fe20a984ff1d0626d25e05ce657d2e9aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 17 May 2023 17:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=80=BC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/controller/TerminalBaseController.java | 21 ++------------ .../pq/service/TerminalBaseService.java | 4 +++ .../service/impl/TerminalBaseServiceImpl.java | 28 +++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) 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 5e5aa6f0a..dca14987a 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 @@ -13,6 +13,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.device.pq.mapper.LineDetailMapper; import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.mapper.OverlimitMapper; @@ -345,25 +346,7 @@ public class TerminalBaseController extends BaseController { @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().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); - overlimitMapper.insert(overlimit); - count++; - } - } + Integer count = terminalBaseService.updatePqOverLimit(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, count, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java index d5978ff82..b399499fa 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalBaseService.java @@ -1,6 +1,7 @@ package com.njcn.device.pq.service; import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel; @@ -193,4 +194,7 @@ public interface TerminalBaseService { * @param file 原始数据信息 */ void importTerminalBase(MultipartFile file, HttpServletResponse response); + + + Integer updatePqOverLimit(); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index fe4106c4d..d50b66926 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -20,6 +20,7 @@ import com.njcn.common.utils.LogUtil; import com.njcn.common.utils.PubUtils; import com.njcn.device.biz.enums.DeviceResponseEnum; import com.njcn.device.biz.pojo.po.Overlimit; +import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.pojo.bo.BaseLineInfo; @@ -1598,6 +1599,33 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple } } + @Override + public Integer 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()); + //监测点限值 + DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData(); + if (Objects.isNull(scaleResult)) { + throw new BusinessException(CommonResponseEnum.DIC_DATA); + } + + + float voltageLevel = Float.parseFloat(scaleResult.getValue()); + Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1,1); + overlimit.setId(lineDetail.getId()); + overlimitMapper.insert(overlimit); + count++; + } + } + return count; + } + private String saveTerminalInfo(List oracleTerminalExcels, List overLimitExcels) { List oracleTerminalExcelMsg = new ArrayList<>(); //任意集合数据为空，不处理