From cc8979d589492abc3dafbbf52f67c46e8755749f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 10 Nov 2022 12:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/service/impl/LineServiceImpl.java     | 5 +++--
 .../src/main/java/com/njcn/user/pojo/dto/DeptDTO.java        | 2 ++
 .../main/java/com/njcn/user/mapper/mapping/DeptMapper.xml    | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
index 6bb78d68c..3651343c8 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
@@ -167,8 +167,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
 
     @Override
     public CommunicateVO getComFlagInfoData(String id, String searchBeginTime, String searchEndTime) {
+        String devId = lineMapper.getDevIndex(id);
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        List<Communicate> communicateList = getCommunicate(id, searchBeginTime, searchEndTime);
+        List<Communicate> communicateList = getCommunicate(devId, searchBeginTime, searchEndTime);
         CommunicateVO communicateVOList = new CommunicateVO();
         List<String> updateTime = new ArrayList<>();
         List<Integer> comType = new ArrayList<>();
@@ -659,7 +660,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         //组装sql语句
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and ");
-        stringBuilder.append("line_id = '").append(lineIndex).append("' group by line_id ").append(InfluxDBPublicParam.TIME_ZONE);
+        stringBuilder.append("dev_id = '").append(lineIndex).append("' group by dev_id ").append(InfluxDBPublicParam.TIME_ZONE);
         String sql = "select * from " + InfluxDBPublicParam.PQS_COMMUNICATE + "  where " + stringBuilder.toString();
         //获取暂降事件
         QueryResult result = influxDbUtils.query(sql);
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
index 032d8e0e8..65329ed28 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/dto/DeptDTO.java
@@ -28,6 +28,8 @@ public class DeptDTO implements Serializable {
 
     private String remark;
 
+    private Integer sort;
+
     /**
      * 部门类型 0-非自定义；1-web自定义；2-App自定义；3-web测试
      */
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
index 69f2c61bf..42ce5f280 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
@@ -126,7 +126,8 @@
             T3.NAME,
             T3.type,
             T5.NAME area ,
-            T3.Remark
+            T3.Remark,
+            T3.sort
         FROM
             (
                 SELECT