From 082b27720b898db6e21d31dcd918a18919f4c495 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 21 Mar 2024 13:23:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8F=98=E7=94=B5=E7=AB=99=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=202.=E8=B0=83=E6=95=B4=E6=8A=80=E6=9C=AF=E7=9B=91?= =?UTF-8?q?=E7=9D=A3=E5=8F=98=E7=94=B5=E7=AB=99=E6=9F=A5=E8=AF=A2=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commApi/CommTerminalGeneralClient.java | 11 ++++ ...mTerminalGeneralClientFallbackFactory.java | 7 +++ .../njcn/device/biz/pojo/dto/SubGetBase.java | 10 ++++ .../ledgerManger/CommTerminalController.java | 11 ++++ .../majornetwork/StatationStatMapper.java | 5 ++ .../mapping/StatationStatMapper.xml | 34 +++++++++++++ .../gwPush/impl/MonitorSendServiceImpl.java | 51 ++++++++++++++----- .../ledgerManger/CommTerminalService.java | 10 ++++ .../impl/CommTerminalServiceImpl.java | 7 +++ .../impl/RStatZwAlarmCountWServiceImpl.java | 4 +- .../pq/controller/CommTerminalController.java | 9 ++++ .../njcn/device/pq/mapper/DeptLineMapper.java | 5 ++ .../pq/mapper/mapping/DeptLineMapper.xml | 42 +++++++++++++++ .../pq/service/CommTerminalService.java | 3 ++ .../device/pq/service/DeptLineService.java | 6 +++ .../service/impl/CommTerminalServiceImpl.java | 19 +++++++ .../pq/service/impl/DeptLineServiceImpl.java | 7 +++ .../impl/RGeneralSurveyPlanPOServiceImpl.java | 42 ++++++++------- .../user/service/impl/DeptServiceImpl.java | 3 ++ 19 files changed, 254 insertions(+), 32 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java index ca12d4af8..aa0623d77 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java @@ -9,6 +9,7 @@ import com.njcn.device.biz.commApi.fallback.CommTerminalGeneralClientFallbackFac import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.pojo.param.MonitorGetParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import io.swagger.annotations.ApiImplicitParam; @@ -193,6 +194,16 @@ public interface CommTerminalGeneralClient { @PostMapping("/tagOrIdGetMonitorList") HttpResult> tagOrIdGetMonitorList(@RequestBody MonitorGetParam monitorGetParam); + + + /** + * 获取变电站信息 + * @param substationParam + * @return + */ + @PostMapping("/tagOrIdGetSub") + HttpResult> tagOrIdGetSub(@RequestBody SubstationParam substationParam); + /** * 用于返回pq 还是pms系统 * diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java index 3bc48ac12..e73cd9976 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java @@ -8,6 +8,7 @@ import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.pojo.param.MonitorGetParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import com.njcn.device.biz.utils.DeviceEnumUtil; @@ -162,6 +163,12 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory throw new BusinessException(finalExceptionEnum); } + @Override + public HttpResult> tagOrIdGetSub(SubstationParam substationParam) { + log.error("{}异常，降级处理，异常为：{}", "根据获取变电站信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult isPqOrPms() { log.error("{}异常，降级处理，异常为：{}", "返回pq还是pms系统", throwable.toString()); diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java index 3121ddaac..524ab15a9 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/SubGetBase.java @@ -30,6 +30,16 @@ public class SubGetBase implements Serializable { */ private String voltageLevel; + /** + * 部门 + */ + private String orgId; + + /** + * 部门名称 + */ + private String orgName; + /** * 所有子级监测点信息 */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index 7f48d5468..04c21d5f5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -11,6 +11,7 @@ import com.njcn.device.biz.pojo.dto.StatisticsMonitor; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.pojo.param.MonitorGetParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import com.njcn.device.pms.pojo.po.Monitor; @@ -407,6 +408,16 @@ public class CommTerminalController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, busBarAndHisMonitorDTOList, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/tagOrIdGetSub") + @ApiOperation("获取变电站信息") + public HttpResult> tagOrIdGetSub(@RequestBody SubstationParam substationParam) { + String methodDescribe = getMethodDescribe("tagOrIdGetSub"); + List subGetBases = commTerminalService.tagOrIdGetSub(substationParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subGetBases, methodDescribe); + } + /** * 用于返回pq 还是pms系统 * @author cdf diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java index 3535e1055..e919b7d6d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java @@ -1,8 +1,12 @@ package com.njcn.device.pms.mapper.majornetwork; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.device.biz.pojo.dto.SubGetBase; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.param.TerminalQueryParam; @@ -41,4 +45,5 @@ public interface StatationStatMapper extends BaseMapper { Page getStatationStatPageList(Page page, @Param("baseParam") TerminalQueryParam baseParam, @Param("orgIds")List orgIds); + List selectStatationStatList(@Param("param") SubstationParam param); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml index 5c111d66e..c345567ec 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml @@ -68,5 +68,39 @@ order by a.org_name,a.Power_Name asc + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index 78e2b284c..d88ba5ab5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -598,39 +598,66 @@ public class MonitorSendServiceImpl implements MonitorSendService { public void exportSend(HttpServletResponse response) throws IOException { ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), WindSourceDto.class).build(); - List wind = this.windSend(getMonitors(dictTreeFeignClient.queryByCode("1401").getData().getId())); + List wind = this.windSend(getMonitors(dictTreeFeignClient.queryByCode(DicTreeEnum.Wind_Farms.getCode()).getData().getId())); WriteSheet writeSheet = EasyExcel.writerSheet(0, "风电场" ).head(WindSourceDto.class).build(); excelWriter.write(wind, writeSheet); - List photovoltaic = this.photovoltaicSend(getMonitors(dictTreeFeignClient.queryByCode("1402").getData().getId())); + List photovoltaic = this.photovoltaicSend(getMonitors(dictTreeFeignClient.queryByCode(DicTreeEnum.Power_Station.getCode()).getData().getId())); WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "光伏电站" ).head(PhotovoltaicDto.class).build(); excelWriter.write(photovoltaic, writeSheet2); - List sensitive = this.sensitiveUserSend(getMonitors(dictTreeFeignClient.queryByCode("2400").getData().getId())); + List sensitive = this.sensitiveUserSend(getMonitors(dictTreeFeignClient.queryByCode(DicTreeEnum.Imp_Users.getCode()).getData().getId())); WriteSheet writeSheet3 = EasyExcel.writerSheet(2, "重要或敏感用户" ).head(SensitiveUserDto.class).build(); excelWriter.write(sensitive, writeSheet3); - List traction = this.tractionStationSend(getMonitors(dictTreeFeignClient.queryByCode("1300").getData().getId())); + List traction = this.tractionStationSend(getMonitors(dictTreeFeignClient.queryByCode(DicTreeEnum.Ele_Railways.getCode()).getData().getId())); WriteSheet writeSheet4 = EasyExcel.writerSheet(3, "牵引站" ).head(TractionStationDTO.class).build(); excelWriter.write(traction, writeSheet4); - List other = this.otherUserSend(getMonitors(dictTreeFeignClient.queryByCode("2300").getData().getId())); + List other = this.otherUserSend(getMonitors("987654321")); WriteSheet writeSheet5 = EasyExcel.writerSheet(4, "干扰用户" ).head(OtherUserDto.class).build(); excelWriter.write(other, writeSheet5); excelWriter.finish(); } private List getMonitors(String id) { - List objType = dictTreeFeignClient.query(id).getData(); + SysDicTreePO dicTree; List objTypeIds=new ArrayList<>(); - objTypeIds.add(id); - if(CollUtil.isNotEmpty(objType)){ - objTypeIds.addAll(objType.stream().map(DictTreeVO::getId).collect(Collectors.toList())); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + if(id.equals("987654321")){ + dicTree = new SysDicTreePO(); + dicTree.setCode("987654321"); + dicTree.setName("其他"); + + //特殊处理 + List sysDicTreePOList = dictTreeFeignClient.queryAll().getData(); + List typicDic =sysDicTreePOList.stream().filter(item-> Objects.equals(DicTreeEnum.Power_Station.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Ele_Railways.getCode(),item.getCode())|| + Objects.equals(DicTreeEnum.Wind_Farms.getCode(),item.getCode())||Objects.equals(DicTreeEnum.Imp_Users.getCode(),item.getCode())).collect(Collectors.toList()); + + for(SysDicTreePO sysDicTreePO : typicDic){ + List temList = dictTreeFeignClient.query(sysDicTreePO.getId()).getData(); + List ids = temList.stream().map(DictTreeVO::getId).collect(Collectors.toList()); + objTypeIds.addAll(ids); + objTypeIds.add(sysDicTreePO.getId()); + } + lambdaQueryWrapper.notIn(Monitor::getObjType, objTypeIds); + }else { + dicTree = dictTreeFeignClient.queryById(id).getData(); + if(ObjectUtil.isNull(dicTree)){ + throw new BusinessException("请检查监测对象类型是否存在"); + } + List objType = dictTreeFeignClient.query(id).getData(); + objTypeIds.add(id); + if(CollUtil.isNotEmpty(objType)){ + objTypeIds.addAll(objType.stream().map(DictTreeVO::getId).collect(Collectors.toList())); + } + lambdaQueryWrapper.in(Monitor::getObjType, objTypeIds); } //获取监测点信息 - List monitorList = monitorService.list(new LambdaQueryWrapper() - .in(Monitor::getObjType, objTypeIds) - ); + lambdaQueryWrapper + .eq(Monitor::getIsUpToGrid,1); + + List monitorList = monitorService.list(lambdaQueryWrapper); List powerIds= monitorList.stream().map(Monitor::getPowerrId).distinct().collect(Collectors.toList()); List statationStats = statationStatService.listByIds(powerIds); Map powerMap = statationStats.stream().collect(Collectors diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java index abb5cdf02..f2784eafa 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.biz.pojo.dto.StatisticsMonitor; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pms.pojo.po.Monitor; import org.springframework.web.bind.annotation.RequestParam; @@ -119,4 +120,13 @@ public interface CommTerminalService { * @return */ List deptSubStationInfo(DeptGetLineParam deptGetLineParam); + + + + /** + * 变电站信息 + * @param + * @return + */ + List tagOrIdGetSub(SubstationParam substationParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 84868711f..3108f941d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.service.ledgerManger.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; @@ -15,6 +16,7 @@ import com.njcn.device.biz.pojo.dto.StatisticsMonitor; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.device.pms.mapper.majornetwork.*; @@ -876,4 +878,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { return result; } + @Override + public List tagOrIdGetSub(SubstationParam param) { + return statationStatMapper.selectStatationStatList(param); + } + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java index bd2328a84..77a2fca8a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java @@ -160,7 +160,9 @@ implements RStatZwAlarmCountWService { .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTime) .eq(RMpTargetWarnD::getIsEffective,1); List measurementPointIdList = rMpTargetWarnDService.list(targetWarnWrapper); - + if (CollUtil.isEmpty(measurementPointIdList)) { + return new ArrayList<>(); + } //获取大于四次的监测点集合 List MonitorIdsQuartic = measurementPointIdList.stream() .filter(obj -> obj.getIsWarn() == 1) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java index 6676d4155..98adb18a1 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java @@ -10,6 +10,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.pojo.po.PqsDeviceUnit; import com.njcn.device.pq.mapper.LineDetailMapper; @@ -336,6 +337,14 @@ public class CommTerminalController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new ArrayList<>(), methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/tagOrIdGetSub") + @ApiOperation("获取变电站信息") + public HttpResult> tagOrIdGetSub(@RequestBody SubstationParam substationParam) { + String methodDescribe = getMethodDescribe("tagOrIdGetSub"); + List subGetBases = commTerminalService.tagOrIdGetSub(substationParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subGetBases, methodDescribe); + } /** * 获取监测点的台账详细信息 * @author cdf diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java index 66a8d2f8a..7748a3957 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java @@ -3,7 +3,9 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; +import com.njcn.device.biz.pojo.dto.SubGetBase; import com.njcn.device.biz.pojo.dto.TerminalGetBase; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pq.pojo.po.DeptLine; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -77,4 +79,7 @@ public interface DeptLineMapper extends BaseMapper { List orgSubStationInfoGet(@Param("list")List devType); List getLineIdByDeptIds(@Param("deptIds")List deptIds,@Param("runFlag")List runFlag,@Param("dataType")List dataType); + + + List selectSubStationList(@Param("param") SubstationParam substationParam); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index 4113939fc..0ae5b6f45 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -137,4 +137,46 @@ #{item} + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java index c559e7b3a..cd7396621 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -83,4 +84,6 @@ public interface CommTerminalService { List deptSubStationInfo(DeptGetLineParam deptGetLineParam); + + List tagOrIdGetSub(SubstationParam substationParam); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java index 05a482eca..d6249b0ee 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java @@ -2,7 +2,9 @@ package com.njcn.device.pq.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; +import com.njcn.device.biz.pojo.dto.SubGetBase; import com.njcn.device.biz.pojo.dto.TerminalGetBase; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pq.pojo.po.DeptLine; import com.njcn.web.pojo.param.DeptLineParam; @@ -107,6 +109,10 @@ public interface DeptLineService extends IService { List orgSubStationInfoGet(List devType); + List getSubStationList(SubstationParam substationParam); + + + /** * 根据监测点id集合查询部门信息id * @param ids 部门ids diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java index a001e49fd..4251425b6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.enums.common.ServerEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -7,12 +8,14 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.EnumUtils; import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pq.mapper.LineMapper; import com.njcn.device.pq.service.CommTerminalService; import com.njcn.device.pq.service.DeptLineService; import com.njcn.redis.utils.RedisUtil; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -250,6 +253,22 @@ public class CommTerminalServiceImpl implements CommTerminalService { return result; } + @Override + public List tagOrIdGetSub(SubstationParam substationParam) { + List subStationList = deptLineService.getSubStationList(substationParam); + if(CollUtil.isNotEmpty(subStationList)){ + List ids = subStationList.stream().map(SubGetBase::getOrgId).collect(Collectors.toList()); + List data = deptFeignClient.getDeptInfoListByIds(ids).getData(); + Map deptMap = data.stream().collect(Collectors.toMap(Dept::getId, Dept::getName)); + subStationList.stream().forEach(x->{ + if(deptMap.containsKey(x.getOrgId())){ + x.setOrgName(deptMap.get(x.getOrgId())); + } + }); + } + return subStationList; + } + private List filterDataTypeNew(String serverName) { List devType = new ArrayList<>(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java index 308d522c0..f2f03abf0 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java @@ -3,7 +3,9 @@ package com.njcn.device.pq.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.biz.pojo.dto.SubGetBase; import com.njcn.device.biz.pojo.dto.TerminalGetBase; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pq.mapper.DeptLineMapper; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; import com.njcn.device.pq.pojo.po.DeptLine; @@ -124,6 +126,11 @@ public class DeptLineServiceImpl extends ServiceImpl i return deptLineMapper.orgSubStationInfoGet(devType); } + @Override + public List getSubStationList(SubstationParam substationParam) { + return deptLineMapper.selectSubStationList(substationParam); + } + @Override public DeptLine getLineByLineIds(String ids) { return this.getOne(new LambdaQueryWrapper() diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index ce92b6c7d..14f015892 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; +import com.njcn.device.biz.pojo.dto.SubGetBase; +import com.njcn.device.biz.pojo.param.SubstationParam; import com.njcn.device.pms.api.StatationStatClient; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; @@ -71,7 +74,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rGeneralSurveyPlanDetailList = new ArrayList<>(); - PmsStatationStatInfoParam param =new PmsStatationStatInfoParam(); + SubstationParam param =new SubstationParam(); param.setPowerIds(rGeneralSurveyPlanAddParm.getSubIds()); - List stationList = statationStatClient.getPowerInfo(param).getData(); - for (StatationStat stat : stationList) { + List stationList = commTerminalGeneralClient.tagOrIdGetSub(param).getData(); + for (SubGetBase stat : stationList) { RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail(); rGeneralSurveyPlanDetail.setPlanNo(rGeneralSurveyPlanAddParm.getPlanNo()); rGeneralSurveyPlanDetail.setOrgNo(stat.getOrgId()); rGeneralSurveyPlanDetail.setOrgName(stat.getOrgName()); - rGeneralSurveyPlanDetail.setSubId(stat.getPowerId()); - rGeneralSurveyPlanDetail.setSubName(stat.getPowerName()); + rGeneralSurveyPlanDetail.setSubId(stat.getId()); + rGeneralSurveyPlanDetail.setSubName(stat.getName()); /*目前时间与计划开始时间，结束时间一致*/ rGeneralSurveyPlanDetail.setGeneralSurveyStartTime(rGeneralSurveyPlanAddParm.getPlanStartTime()); rGeneralSurveyPlanDetail.setGeneralSurveyTime(rGeneralSurveyPlanAddParm.getPlanStartTime()); @@ -424,7 +427,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl list = statationStatClient.getPowerInfo(new PmsStatationStatInfoParam()).getData(); + List list = commTerminalGeneralClient.tagOrIdGetSub(null).getData(); + /**查出当前周期id**/ QueryWrapper rSurveyCyclePOQueryWrapper = new QueryWrapper(); @@ -447,8 +451,8 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl finalSubIds = subIds; - List filterList = list.stream().filter(temp -> !finalSubIds.contains(temp.getPowerId())).collect(Collectors.toList()); - List addList = new ArrayList<>(); + List filterList = list.stream().filter(temp -> !finalSubIds.contains(temp.getId())).collect(Collectors.toList()); + List addList = new ArrayList<>(); List rSurveyPlanConfigPOList = rSurveyPlanConfigService.list(); Map orgIdMap = rSurveyPlanConfigPOList.stream(). @@ -459,7 +463,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl collect = filterList.stream().filter(statationStat -> Objects. + List collect = filterList.stream().filter(statationStat -> Objects. equals(statationStat.getOrgId(), temp.getId())).collect(Collectors.toList()); RSurveyPlanConfigPO rSurveyPlanConfigPO = orgIdMap.get(temp.getId()); //向上取整 @@ -467,7 +471,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl= v) { Collections.shuffle(collect); - List lastList = collect.stream().limit(v).collect(Collectors.toList()); + List lastList = collect.stream().limit(v).collect(Collectors.toList()); addList.addAll(lastList); } else { addList.addAll(collect); @@ -479,13 +483,13 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl addList.size()) { /*取差集，当通过比例抽取变电站不够时 重差集里取*/ - List collect = filterList.stream().filter(o -> !addList.contains(o)).collect(Collectors.toList()); + List collect = filterList.stream().filter(o -> !addList.contains(o)).collect(Collectors.toList()); int differenceCount = statetionNum - addList.size(); Collections.shuffle(collect); - List lastList = collect.stream().limit(differenceCount).collect(Collectors.toList()); + List lastList = collect.stream().limit(differenceCount).collect(Collectors.toList()); addList.addAll(lastList); } - List result = addList.stream().map(StatationStat::getPowerId).collect(Collectors.toList()); + List result = addList.stream().map(SubGetBase::getId).collect(Collectors.toList()); RGeneralSurveyPlanAddParm rGeneralSurveyPlanAddParm = new RGeneralSurveyPlanAddParm(); rGeneralSurveyPlanAddParm.setSubIds(result); return rGeneralSurveyPlanAddParm; @@ -547,16 +551,16 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl list1 = statationStatClient.getPowerInfo(param).getData(); + List list1 = commTerminalGeneralClient.tagOrIdGetSub(param).getData(); List children = deptSubstationVO.getChildren(); List collect = list1.stream().map(statationStat -> { DeptSubstationVO deptSubstationVO1 = new DeptSubstationVO(); - deptSubstationVO1.setId(statationStat.getPowerId()); + deptSubstationVO1.setId(statationStat.getId()); deptSubstationVO1.setPid(temp.getId()); - deptSubstationVO1.setName(statationStat.getPowerName()); - if (finalSubIds.contains(statationStat.getPowerId())) { + deptSubstationVO1.setName(statationStat.getName()); + if (finalSubIds.contains(statationStat.getId())) { deptSubstationVO1.setDisabled(true); } deptSubstationVO1.setFlag(true); diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java index 4ed404ce4..d73eee6bf 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java @@ -114,6 +114,9 @@ public class DeptServiceImpl extends ServiceImpl implements ID } //默认为正常状态 dept.setState(DataStateEnum.ENABLE.getCode()); + if (StrUtil.isBlank(dept.getCode())){ + dept.setCode(dept.getId()); + } return this.save(dept); }