数据同步，新增电站

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<LineMapper, Line> imple
 
 
         //变电站 todo 可能新建电站
-//        if (Objects.nonNull(addTerminalParam.getSubStationParam())) {
+        if (Objects.nonNull(syncTerminalParam.getSubStationParam())) {
-//            if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) {
+            if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) {
-//                checkName(addTerminalParam, LineBaseEnum.SUB_LEVEL.getCode(), gdIndex);
+                Line subStation = assembleLine(syncTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, syncTerminalParam.getSubStationParam().getSort());
-//                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);
-//                this.baseMapper.insert(subStation);
+                subIndex = subStation.getId();
-//                subIndex = subStation.getId();
+
-//
+                //变电站下的经纬度入库
-//                //变电站下的经纬度入库
+                Substation sub = new Substation();
-//                Substation sub = new Substation();
+                sub.setId(subIndex);
-//                sub.setId(subIndex);
+                sub.setScale(syncTerminalParam.getSubStationParam().getScale());
-//                sub.setScale(addTerminalParam.getSubStationParam().getScale());
+                sub.setLng(syncTerminalParam.getSubStationParam().getLng());
-//                sub.setLng(addTerminalParam.getSubStationParam().getLng());
+                sub.setLat(syncTerminalParam.getSubStationParam().getLat());
-//                sub.setLat(addTerminalParam.getSubStationParam().getLat());
+                substationMapper.insert(sub);
-//                substationMapper.insert(sub);
+            }
-//            }
+        }
-//        }
 
         //装置
 

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;
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml

@@ -38,10 +38,9 @@
 
   <select id="page" resultType="com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO">
     SELECT
-    supervision_dev_main_report.*,station.name substation,dev.monitoring_terminal_code,dev.monitoring_terminal_name
+    supervision_dev_main_report.*,dev.substation_name substationName,dev.monitoring_terminal_code,dev.monitoring_terminal_name
     FROM supervision_dev_main_report supervision_dev_main_report
     left join supervision_temp_device_report dev on supervision_dev_main_report.id = dev.id
-    left join pq_Line station on dev.substation = station.id
     WHERE ${ew.sqlSegment}
   </select>
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -191,7 +191,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         supervisionDevMainReportVO.setOrgName(deptFeignClient.getDeptById(byId.getOrgId()).getData().getName());
 
         SupervisionTempDeviceReport supervisionTempDeviceReport = supervisionTempDeviceReportService.lambdaQuery().eq(SupervisionTempDeviceReport::getId, id).one();
-        supervisionTempDeviceReport.setSubstation(lineFeignClient.getSubstationInfo(supervisionTempDeviceReport.getSubstation()).getData().getName());
+//        supervisionTempDeviceReport.setSubstation(lineFeignClient.getSubstationInfo(supervisionTempDeviceReport.getSubstation()).getData().getName());
         supervisionTempDeviceReport.setPowerCompany(deptFeignClient.getDeptById(supervisionTempDeviceReport.getPowerCompany()).getData().getName());
         supervisionDevMainReportVO.setSupervisionTempDeviceReport(supervisionTempDeviceReport);
         return supervisionDevMainReportVO;

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java

@@ -12,6 +12,7 @@ import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.pq.api.DeptLineFeignClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.TerminalBaseClient;
 import com.njcn.device.pq.pojo.param.*;
@@ -70,7 +71,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
 
     private final DictTreeFeignClient dictTreeFeignClient;
     private final DicDataFeignClient dicDataFeignClient;
-
+    private final DeptLineFeignClient deptLineFeignClient;
     private final UserFeignClient userFeignClient;
     private final TerminalBaseClient terminalBaseClient;
     @Override
@@ -201,19 +202,39 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
 
         //获取关联的设备信息
         SupervisionTempDeviceReport tempDevice = supervisionTempDeviceReportService.getById(tempLine.getMonitoringTerminalCode());
-        List<Line> 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
+        if(tempDevice.getCustomubstaionlag()==0){
-        SubStationParam subStationParam = new SubStationParam();
+            List<Line> 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<String> data1 = deptLineFeignClient.getLineNodeByDeptId(tempDevice.getPowerCompany()).getData();
+            List<Line> 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();