From a87b421720125ecff9241e17d1f77a51ccdb1688 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 30 May 2024 20:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TerminalBaseServiceImpl.java | 31 +++++++------ .../vo/device/SupervisionDevMainReportVO.java | 2 +- .../SupervisionDevMainReportPOMapper.xml | 3 +- ...SupervisionDevMainReportPOServiceImpl.java | 2 +- ...SupervisionTempLineDebugPOServiceImpl.java | 43 ++++++++++++++----- 5 files changed, 50 insertions(+), 31 deletions(-) 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 3e5fee4c3..a5763e0e2 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 @@ -1845,22 +1845,21 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple //变电站 todo 可能新建电站 -// if (Objects.nonNull(addTerminalParam.getSubStationParam())) { -// if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) { -// checkName(addTerminalParam, LineBaseEnum.SUB_LEVEL.getCode(), gdIndex); -// Line subStation = assembleLine(addTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, addTerminalParam.getSubStationParam().getSort()); -// this.baseMapper.insert(subStation); -// subIndex = subStation.getId(); -// -// //变电站下的经纬度入库 -// Substation sub = new Substation(); -// sub.setId(subIndex); -// sub.setScale(addTerminalParam.getSubStationParam().getScale()); -// sub.setLng(addTerminalParam.getSubStationParam().getLng()); -// sub.setLat(addTerminalParam.getSubStationParam().getLat()); -// substationMapper.insert(sub); -// } -// } + if (Objects.nonNull(syncTerminalParam.getSubStationParam())) { + if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) { + Line subStation = assembleLine(syncTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, syncTerminalParam.getSubStationParam().getSort()); + this.baseMapper.insert(subStation); + subIndex = subStation.getId(); + + //变电站下的经纬度入库 + Substation sub = new Substation(); + sub.setId(subIndex); + sub.setScale(syncTerminalParam.getSubStationParam().getScale()); + sub.setLng(syncTerminalParam.getSubStationParam().getLng()); + sub.setLat(syncTerminalParam.getSubStationParam().getLat()); + substationMapper.insert(sub); + } + } //装置 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java index 6e0c8b966..d3f9dc8de 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java @@ -160,7 +160,7 @@ public class SupervisionDevMainReportVO { - private String substation; + private String substationName; private String monitoringTerminalCode; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml index f173f9e0d..75ced4286 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml @@ -38,10 +38,9 @@ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 33f1e6089..ef20a1bb8 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -191,7 +191,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl data = lineFeignClient.getBaseLineList(Stream.of(tempDevice.getSubstation()).collect(Collectors.toList())).getData(); - String pids = data.get(0).getPids(); - String[] idsArray = pids.split(","); - SyncTerminalParam syncTerminalParam = new SyncTerminalParam(); - syncTerminalParam.setProjectIndex(idsArray[0]); - syncTerminalParam.setProvinceIndex(idsArray[1]); - syncTerminalParam.setGdIndex(idsArray[2]); - syncTerminalParam.setSubIndex(tempDevice.getSubstation()); //用于绑定监测点部门 syncTerminalParam.setDeptId(tempDevice.getPowerCompany()); - //电站可能后期要录 todo - SubStationParam subStationParam = new SubStationParam(); + if(tempDevice.getCustomubstaionlag()==0){ + List data = lineFeignClient.getBaseLineList(Stream.of(tempDevice.getSubstation()).collect(Collectors.toList())).getData(); + String pids = data.get(0).getPids(); + String[] idsArray = pids.split(","); + + syncTerminalParam.setProjectIndex(idsArray[0]); + syncTerminalParam.setProvinceIndex(idsArray[1]); + syncTerminalParam.setGdIndex(idsArray[2]); + syncTerminalParam.setSubIndex(tempDevice.getSubstation()); + + }else { + //电站可能后期要录 todo + List data1 = deptLineFeignClient.getLineNodeByDeptId(tempDevice.getPowerCompany()).getData(); + List data = lineFeignClient.getBaseLineList(data1).getData(); + String pids = data.get(0).getPids(); + + String[] idsArray = pids.split(","); + + syncTerminalParam.setProjectIndex(idsArray[0]); + syncTerminalParam.setProvinceIndex(idsArray[1]); + syncTerminalParam.setGdIndex(idsArray[2]); + + SubStationParam subStationParam = new SubStationParam(); + subStationParam.setName(tempDevice.getSubstationName()); + subStationParam.setSort(0); + subStationParam.setScale(tempDevice.getSubstationVoltageLevel()); + + } + + //syncTerminalParam.setSubStationParam(); DeviceParam deviceParam = new DeviceParam();