From a26b78b225387d03f7857f326caac9498c961580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 9 Aug 2022 11:15:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/device/pojo/vo/AreaLineInfoVO.java   |  3 +
 .../njcn/device/mapper/mapping/LineMapper.xml | 65 -------------------
 .../com/njcn/user/api/DeptFeignClient.java    |  4 +-
 .../DeptFeignClientFallbackFactory.java       |  4 +-
 4 files changed, 7 insertions(+), 69 deletions(-)

diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java
index 794a3a2c5..e06097893 100644
--- a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java
+++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java
@@ -38,6 +38,9 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "voltageName",value = "母线名称")
     private String voltageName;
 
+    @ApiModelProperty(name = "voltageScale",value = "监测点电压等级")
+    private String voltageScale;
+
     @ApiModelProperty(name = "noDealCount",value = "未处理暂降事件")
     private Integer noDealCount;
 
diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml
index b341e9d66..a09e66579 100644
--- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml
+++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml
@@ -145,72 +145,7 @@
 
     <!--华丽分割线   ++++                          -->
 
-    <select id="getVoltageListByLineIds" resultType="TerminalTree">
-        select distinct b.id,c.name,b.scale,b.level,b.sort from pq_line a
-        inner join pq_voltage b on a.pid = b.id
-        inner join sys_dict_data c on b.scale = c.id
-        where a.id in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        a.level = 5
-        and a.state = 1
-        order by a.sort
-    </select>
 
-    <!--母线-->
-    <select id="getDevListByLineIds" resultType="TerminalTree">
-        select c.id,c.pid,c.name,e.name manufacturer,c.level,c.sort
-        from pq_line a
-        inner join pq_line b on a.pid = b.id
-        inner join pq_line c on b.pid = c.id
-        inner join pq_device d on c.id = d.id
-        inner join sys_dict_data e on d.manufacturer = e.id
-        where a.id in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        and d.manufacturer = #{manufacturer}
-        a.level = 5
-        and a.state = 1
-        order by a.sort
-    </select>
-
-    <!--设备-->
-    <select id="getDevListByLineIds" resultType="TerminalTree">
-        select c.id,c.pid,c.name,e.name manufacturer,c.level,c.sort
-        from pq_line a
-        inner join pq_line b on a.pid = b.id
-        inner join pq_line c on b.pid = c.id
-        inner join pq_device d on c.id = d.id
-        inner join sys_dict_data e on d.manufacturer = e.id
-        where a.id in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        and d.manufacturer = #{manufacturer}
-        a.level = 5
-        and a.state = 1
-        order by a.sort
-    </select>
-
-    <select id="getDevListByLineIds" resultType="TerminalTree">
-        select d.id,d.pid,d.name,f.name scale,d.level,d.sort
-        from pq_line a
-        inner join pq_line b on a.pid = b.id
-        inner join pq_line c on b.pid = c.id
-        inner join pq_line d on c.pid = d.id
-        inner join pq_linedetail e on d.id = e.id
-        inner join sys_dict_data f on e.scale = f.id
-        where a.id in
-        <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        and d.manufacturer = #{manufacturer}
-        a.level = 5
-        and a.state = 1
-        order by a.sort
-    </select>
 
 
     <select id="getUnBindList" resultType="TerminalTree">
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
index dd18cf685..cadb640e0 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/DeptFeignClient.java
@@ -55,14 +55,14 @@ public interface DeptFeignClient {
     HttpResult<List<PvTerminalTreeVO>> allDeptList();
 
     /**
-     * 获取所有部门
+     * 根据部门id获取部门信息
      */
     @GetMapping("/getDeptById")
     HttpResult<Dept> getDeptById(@RequestParam("deptId") String deptId);
 
 
     /**
-     * 获取所有部门
+     * 根据部门id获取所有子部门ids
      */
     @GetMapping("/getDepSonIdtByDeptId")
     HttpResult<List<String>> getDepSonIdtByDeptId(@RequestParam("deptId") String deptId);
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
index 64ab3fc15..0ec22c16a 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/api/fallback/DeptFeignClientFallbackFactory.java
@@ -66,13 +66,13 @@ public class DeptFeignClientFallbackFactory implements FallbackFactory<DeptFeign
 
             @Override
             public HttpResult<Dept> getDeptById(String deptId) {
-                log.error("{}异常，降级处理，异常为：{}","查询所部门异常",cause.toString());
+                log.error("{}异常，降级处理，异常为：{}","查询部门信息异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
 
             @Override
             public HttpResult<List<String>> getDepSonIdtByDeptId(String deptId) {
-                log.error("{}异常，降级处理，异常为：{}","查询所部门索引异常",cause.toString());
+                log.error("{}异常，降级处理，异常为：{}","查询所有子孙部门异常",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }