From 16c933d63137a8a31eb57ac1f9c00dddfbbb965a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 18 May 2023 15:00:49 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerManger/PmsLedgerDeptController.java | 57 +++++++++++++---- .../impl/StatationStatServiceImpl.java | 63 ++++++++++++++++--- .../pq/controller/PqLedgerDeptController.java | 2 + .../service/impl/TerminalBaseServiceImpl.java | 58 +++++++++++------ .../RmpEventDetailController.java | 2 +- .../Impl/AreaInfoServiceImpl.java | 2 +- .../njcn/user/mapper/mapping/DeptMapper.xml | 4 +- 7 files changed, 147 insertions(+), 41 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsLedgerDeptController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsLedgerDeptController.java index e536f31c3..8308fdcd7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsLedgerDeptController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsLedgerDeptController.java @@ -6,14 +6,9 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pms.pojo.po.Monitor; -import com.njcn.device.pms.pojo.po.PowerClient; -import com.njcn.device.pms.pojo.po.PowerDistributionarea; -import com.njcn.device.pms.pojo.po.PowerGenerationUser; -import com.njcn.device.pms.service.majornetwork.IMonitorService; -import com.njcn.device.pms.service.majornetwork.IPowerClientService; -import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; -import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService; +import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; +import com.njcn.device.pms.pojo.po.*; +import com.njcn.device.pms.service.majornetwork.*; import com.njcn.user.pojo.po.Dept; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.RequestUtil; @@ -23,6 +18,7 @@ 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 springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.util.stream.Collectors; @@ -47,8 +43,13 @@ public class PmsLedgerDeptController extends BaseController { private final IPowerClientService iPowerClientService; + private final IStatationStatService iStatationStatService; + + private final ITerminalService iTerminalService; + @PostMapping("update") + @ApiIgnore public HttpResult updateLedger(@RequestBody Dept dept){ String methodDescribe = getMethodDescribe("updateLedger"); @@ -81,7 +82,7 @@ public class PmsLedgerDeptController extends BaseController { powerDistributionarea.setOperationName(dept.getName()); return powerDistributionarea; }).collect(Collectors.toList()); - iPowerDistributionareaService.saveBatch(powerDistributionareaListP); + iPowerDistributionareaService.updateBatchById(powerDistributionareaListP); } //发电用户 @@ -97,7 +98,7 @@ public class PmsLedgerDeptController extends BaseController { powerClient.setOperationName(dept.getName()); return powerClient; }).collect(Collectors.toList()); - iPowerClientService.saveBatch(powerClientListP); + iPowerClientService.updateBatchById(powerClientListP); } //用电用户 @@ -113,10 +114,44 @@ public class PmsLedgerDeptController extends BaseController { powerGenerationUser.setOperationName(dept.getName()); return powerGenerationUser; }).collect(Collectors.toList()); - iPowerGenerationUserService.saveBatch(powerGenerationUserListP); + iPowerGenerationUserService.updateBatchById(powerGenerationUserListP); } + //电站 + LambdaQueryWrapper statationStatLambdaQueryWrapper = new LambdaQueryWrapper<>(); + statationStatLambdaQueryWrapper.eq(StatationStat::getStatus, DataStateEnum.ENABLE.getCode()) + .eq(StatationStat::getOrgId,dept.getCode()); + List statationStatList = iStatationStatService.list(statationStatLambdaQueryWrapper); + if(CollectionUtil.isNotEmpty(statationStatList)){ + List statationStatListP = statationStatList.stream().map(it->{ + StatationStat statationStat = new StatationStat(); + statationStat.setPowerId(it.getPowerId()); + statationStat.setOrgName(dept.getName()); + return statationStat; + }).collect(Collectors.toList()); + iStatationStatService.updateBatchById(statationStatListP); + } + + //装置 + LambdaQueryWrapper terminalLambdaQueryWrapper = new LambdaQueryWrapper<>(); + terminalLambdaQueryWrapper.eq(PmsTerminal::getStatus, DataStateEnum.ENABLE.getCode()) + .and(item->item.eq(PmsTerminal::getOrgId,dept.getCode()).or().eq(PmsTerminal::getOperationId,dept.getCode())); + List pmsTerminalList = iTerminalService.list(terminalLambdaQueryWrapper); + if(CollectionUtil.isNotEmpty(pmsTerminalList)){ + List pmsTerminalListP = pmsTerminalList.stream().map(it->{ + PmsTerminal pmsTerminal = new PmsTerminal(); + pmsTerminal.setId(it.getId()); + pmsTerminal.setOrgName(dept.getName()); + pmsTerminal.setOperationName(dept.getName()); + return pmsTerminal; + }).collect(Collectors.toList()); + iTerminalService.updateBatchById(pmsTerminalListP); + } + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java index 03e56c9c3..dcf8627a0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.service.majornetwork.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,9 +12,7 @@ import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.StatationStatParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; -import com.njcn.device.pms.pojo.po.GeneratrixWire; -import com.njcn.device.pms.pojo.po.PmsTerminal; -import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.pojo.po.*; import com.njcn.device.pms.pojo.vo.StatationStatVO; import com.njcn.device.pms.service.majornetwork.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,11 +21,13 @@ import com.njcn.user.pojo.po.Dept; import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** *

@@ -48,11 +49,13 @@ public class StatationStatServiceImpl extends ServiceImpl monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + monitorLambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()).eq(Monitor::getPowerrId,statationStat.getPowerId()); + + //主网监测点 + List monitorList = iMonitorService.list(monitorLambdaQueryWrapper); + if(CollectionUtil.isNotEmpty(monitorList)){ + List monitorListP = monitorList.stream().map(item->{ + Monitor monitor = new Monitor(); + monitor.setPowerrName(statationStat.getPowerName()); + monitor.setId(item.getId()); + return monitor; + }).collect(Collectors.toList()); + iMonitorService.updateBatchById(monitorListP); + } + //台区 + LambdaQueryWrapper powerDistributionareaLambdaQueryWrapper = new LambdaQueryWrapper<>(); + powerDistributionareaLambdaQueryWrapper.eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode()).eq(PowerDistributionarea::getPowerStationId,statationStat.getPowerId()); + + List powerDistributionareaList = powerDistributionareaMapper.selectList(powerDistributionareaLambdaQueryWrapper); + if(CollectionUtil.isNotEmpty(powerDistributionareaList)){ + powerDistributionareaList.forEach(item->{ + PowerDistributionarea powerDistributionarea = new PowerDistributionarea(); + powerDistributionarea.setPowerrName(statationStat.getPowerName()); + powerDistributionarea.setId(item.getId()); + powerDistributionareaMapper.updateById(powerDistributionarea); + }); + } + //装置 + //台区 + LambdaQueryWrapper pmsTerminalLambdaQueryWrapper = new LambdaQueryWrapper<>(); + pmsTerminalLambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode()).eq(PmsTerminal::getPowerStationId,statationStat.getPowerId()); + + List pmsTerminalList = terminalMapper.selectList(pmsTerminalLambdaQueryWrapper); + if(CollectionUtil.isNotEmpty(pmsTerminalList)){ + pmsTerminalList.forEach(item->{ + PmsTerminal pmsTerminalP = new PmsTerminal(); + pmsTerminalP.setPowerrName(statationStat.getPowerName()); + pmsTerminalP.setId(item.getId()); + terminalMapper.updateById(pmsTerminalP); + }); + } + return true; } + + @Override public boolean delStatationStat(List statationStatIds) { //删除前需要判断是否存在绑定关系 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqLedgerDeptController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqLedgerDeptController.java index b0d65dab9..dc2023906 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqLedgerDeptController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqLedgerDeptController.java @@ -12,6 +12,7 @@ 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 springfox.documentation.annotations.ApiIgnore; /** @@ -35,6 +36,7 @@ public class PqLedgerDeptController extends BaseController { * @date 2023/5/17 */ @PostMapping("update") + @ApiIgnore public HttpResult updateLedger(@RequestBody Dept dept){ String methodDescribe = getMethodDescribe("updateLedger"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); 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 d50b66926..b09efaa57 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 @@ -395,34 +395,44 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple //删除与当前线路号重复的项 listLineNum.removeIf(lineNo -> lineNo.equals(lineParam.getNum())); HttpResult httpScale = dicDataFeignClient.getDicDataById(subVoltageParam.getScale()); - Float jcap = DeviceUtil.getJCAPByScale(httpScale.getData().getName()); Line line = assembleLine(lineParam.getName(), LineBaseEnum.LINE_LEVEL.getCode(), subvIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex + StrUtil.COMMA + devIdIndex + StrUtil.COMMA + subvIndex, lineParam.getSort()); this.baseMapper.insert(line); LineDetail lineDetail = new LineDetail(); BeanUtils.copyProperties(lineParam, lineDetail); lineDetail.setId(line.getId()); - lineDetail.setStandardCapacity(jcap); + //判断国网监测点id if (StrUtil.isNotBlank(lineDetail.getMonitorId())) { lineDetail.setMonitorFlag(1); } else { lineDetail.setMonitorFlag(0); } + lineDetailMapper.insert(lineDetail); + //通过监测点id获取母线电压等级 Voltage voltage = lineMapper.getVoltageByLineId(line.getId()); //监测点限值 - HttpResult scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()); - String scaTmp = scaleResult.getData().getValue(); - Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); + DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData(); + float scaTmp = Float.parseFloat(scaleResult.getValue()); + Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp,lineDetail.getDealCapacity(),lineDetail.getDevCapacity(),lineDetail.getShortCapacity(),1,1); + + if(Objects.isNull(lineParam.getVoltageDev())){ + overlimit.setVoltageDev(overlimit.getVoltageDev()); + }else { + overlimit.setVoltageDev(lineParam.getVoltageDev()); + } + if(Objects.isNull(lineParam.getUvoltageDev())){ + overlimit.setUvoltageDev(overlimit.getUvoltageDev()); + }else { + overlimit.setUvoltageDev(lineParam.getUvoltageDev()); + } + //Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); overlimitMapper.deleteById(line.getId()); - //页面存在自己填写的电压上下偏差 - overlimit.setVoltageDev(lineParam.getVoltageDev()); - overlimit.setUvoltageDev(lineParam.getUvoltageDev()); + overlimit.setId(line.getId()); overlimitMapper.insert(overlimit); - } } @@ -706,15 +716,25 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple || ((!overlimitTem.getUvoltageDev().equals(updateLineBO.getUvoltageDev())))) ) { - overlimitMapper.deleteById(line.getId()); + //监测点限值 - HttpResult scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale()); - if (Objects.isNull(scaleResult.getData())) { - throw new BusinessException(CommonResponseEnum.DIC_DATA); + DictData scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale()).getData(); + float scaTmp = Float.parseFloat(scaleResult.getValue()); + + //监测点限值 + Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp,lineDetail.getDealCapacity(),lineDetail.getDevCapacity(),lineDetail.getShortCapacity(),1,1); + if(Objects.isNull(updateLineBO.getVoltageDev())){ + overlimit.setVoltageDev(overlimit.getVoltageDev()); + }else { + overlimit.setVoltageDev(updateLineBO.getVoltageDev()); } - Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); - overlimit.setVoltageDev(updateLineBO.getVoltageDev()); - overlimit.setUvoltageDev(updateLineBO.getUvoltageDev()); + if(Objects.isNull(updateLineBO.getUvoltageDev())){ + overlimit.setUvoltageDev(overlimit.getUvoltageDev()); + }else { + overlimit.setUvoltageDev(updateLineBO.getUvoltageDev()); + } + overlimit.setId(line.getId()); + overlimitMapper.deleteById(line.getId()); overlimitMapper.insert(overlimit); } if (!Objects.equals(lineDetail.getCt1(), lineDetailRes.getCt1()) || !Objects.equals(lineDetail.getCt2(), lineDetailRes.getCt2()) @@ -1604,10 +1624,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple List lineDetailList = lineDetailMapper.selectList(new LambdaQueryWrapper<>()); int count = 0; - for(LineDetail lineDetail:lineDetailList){ + for (LineDetail lineDetail : lineDetailList) { overlimitMapper.deleteById(lineDetail.getId()); Line line = lineMapper.selectById(lineDetail.getId()); - if(Objects.nonNull(line)) { + if (Objects.nonNull(line)) { Voltage voltage = voltageMapper.selectById(line.getPid()); //监测点限值 DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData(); @@ -1617,7 +1637,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple float voltageLevel = Float.parseFloat(scaleResult.getValue()); - Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1,1); + Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 1); overlimit.setId(lineDetail.getId()); overlimitMapper.insert(overlimit); count++; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RmpEventDetailController.java b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RmpEventDetailController.java index 0151ebb42..b311e2332 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RmpEventDetailController.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RmpEventDetailController.java @@ -80,7 +80,7 @@ public class RmpEventDetailController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getTransientDetailById") - @ApiOperation("根据条件查询暂态事件") + @ApiOperation("根据暂降事件id获取详情") @ApiImplicitParams({ @ApiImplicitParam(name = "eventId", value = "暂降事件id", required = true), @ApiImplicitParam(name = "sysType", value = "系统类型 pq,pms", required = true), diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java index d61bab29c..e87ae50a2 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java @@ -52,7 +52,7 @@ public class AreaInfoServiceImpl implements AreaInfoService { List generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData(); List lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); - System.out.println(lineIds.size()); + if (CollectionUtil.isNotEmpty(lineIds)) { List resList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml index 1f0b8b3a0..fe2874030 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml @@ -30,7 +30,7 @@ SELECT T3.*, T5.id area, - T5.NAME areaName + T5.Short_Name areaName FROM sys_dept T3, sys_area T5 @@ -46,7 +46,7 @@ SELECT T3.*, T5.id area, - T5.NAME areaName + T5.Short_Name areaName FROM sys_dept T3, sys_area T5