From 5cf35a39ffa7ff5b01d170070b8deab4073962b3 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 31 May 2024 13:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/param/device/SupervisionTempDeviceReportParam.java    | 2 +-
 .../pojo/po/device/SupervisionTempDeviceReport.java            | 2 +-
 .../device/impl/SupervisionTempLineDebugPOServiceImpl.java     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
index f3bad5c85..7a97c0de5 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
@@ -36,7 +36,7 @@ public class SupervisionTempDeviceReportParam {
      * 0 关联系统内变电站;1用户手动输入变电站
      */
     @ApiModelProperty(value = " 0 关联系统内变电站;1用户手动输入变电站")
-    private Integer customubstaionlag;
+    private Integer customSubstaionflag;
 
     /**
      * 所属变电站
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
index 6451a074c..e21855226 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
@@ -36,7 +36,7 @@ public class SupervisionTempDeviceReport {
      * 0 关联系统内变电站;1用户手动输入变电站
      */
     @TableField(value = "custom_substaion_flag")
-    private Integer customubstaionlag;
+    private Integer customSubstaionflag;
 
 
     /**
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
index 0b9bad6d1..bba898061 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
@@ -205,7 +205,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
         SyncTerminalParam syncTerminalParam = new SyncTerminalParam();
         //用于绑定监测点部门
         syncTerminalParam.setDeptId(tempDevice.getPowerCompany());
-        if(tempDevice.getCustomubstaionlag()==0){
+        if(tempDevice.getCustomSubstaionflag()==0){
             List<Line> data = lineFeignClient.getBaseLineList(Stream.of(tempDevice.getSubstation()).collect(Collectors.toList())).getData();
             String pids = data.get(0).getPids();
             String[] idsArray = pids.split(",");
@@ -231,6 +231,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             subStationParam.setName(tempDevice.getSubstationName());
             subStationParam.setSort(0);
             subStationParam.setScale(tempDevice.getSubstationVoltageLevel());
+            syncTerminalParam.setSubStationParam(subStationParam);
 
         }