From d972bbef8029853e688c00b7cb10c334c51cba4d Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Wed, 31 Jul 2024 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=85=A5=E7=BD=91=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.终端入网检测添加经纬度的录入功能；

2.同步台账时，不是系统电站的需要将经纬度同步

二、监测点台账录入

1.关联终端下拉框里面的数据展示终端编号，不展示终端名称
---
 .../java/com/njcn/device/biz/pojo/dto/SubGetBase.java | 11 +++++++++++
 .../device/pq/controller/TerminalBaseController.java  |  2 +-
 .../njcn/device/pq/mapper/mapping/DeptLineMapper.xml  |  4 +++-
 .../impl/SupervisionTempLineDebugPOServiceImpl.java   |  2 ++
 4 files changed, 17 insertions(+), 2 deletions(-)

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 3042fc9ab..8461d44e5 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
@@ -3,6 +3,7 @@ package com.njcn.device.biz.pojo.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -30,6 +31,16 @@ public class SubGetBase implements Serializable {
      */
     private String voltageLevel;
 
+    /**
+     * 经度
+     */
+    private BigDecimal lng;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal lat;
+
     /**
      * 部门
      */
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
index 30c30da7f..e63ed6dec 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
@@ -121,7 +121,7 @@ public class TerminalBaseController extends BaseController {
     }
 
 
-    @ApiOperation("终端/母线/监测点同步操作")
+    @ApiOperation("变电站/终端/母线/监测点同步操作")
     @OperateInfo(operateType = OperateType.ADD, info = LogEnum.BUSINESS_MEDIUM)
     @PostMapping("terminalSync")
     public HttpResult<String> terminalSync(@Valid @RequestBody SyncTerminalParam syncTerminalParam) {
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 321905d38..ffc9f5692 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
@@ -156,7 +156,9 @@
             substation.id id,
             substation.name name,
             pq_dept_line.id orgId,
-            sub.Scale   voltageLevel
+            sub.Scale   voltageLevel,
+            sub.lng lng,
+            sub.lat lat
         from pq_dept_line pq_dept_line
              inner join pq_line point on pq_dept_line.line_id = point.id
              inner join pq_line_detail lineDetail on point.id = lineDetail.id
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 12507e293..5dab009fc 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
@@ -362,6 +362,8 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             subStationParam.setName(tempDevice.getSubstationName());
             subStationParam.setSort(0);
             subStationParam.setScale(tempDevice.getSubstationVoltageLevel());
+            subStationParam.setLat(tempDevice.getLatitude());
+            subStationParam.setLng(tempDevice.getLongitude());
             syncTerminalParam.setSubStationParam(subStationParam);
 
         }