From a543ad7d456adc54daad457b87ef487d799fc758 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 27 Sep 2024 15:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/common/entity/app/vo/DevInfoVo.java | 3 ++-
 .../bonus/bracelet/service/impl/ConsControlServiceImpl.java | 6 ++++--
 .../main/resources/mapper/bracelet/ConsControlMapper.xml    | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java
index 39d4003..3c7a5dd 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/DevInfoVo.java
@@ -28,9 +28,10 @@ public class DevInfoVo {
     private String leaderPhone;
     /**电量*/
     private String electricQuantity;
-
     /**班组名称*/
     private String teamName;
     /**工程名称*/
     private String proName;
+    /**告警位置*/
+    private String warnPosition;
 }
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
index 137bb88..d90de49 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java
@@ -526,6 +526,8 @@ public class ConsControlServiceImpl implements IConsControlService {
             for (DevInfoVo vo : list) {
                 vo.setLeaderPhone(Sm4Utils.decode(vo.getLeaderPhone()));
             }
+            list.get(0).setIsWarn(1);
+            list.get(0).setWarnPosition("134");
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
@@ -567,8 +569,8 @@ public class ConsControlServiceImpl implements IConsControlService {
         try {
             dto.setDevType(BusinessConstants.JD);
             // 告警数据默认展示当天，不需要加日期限制可去掉
-            dto.setStartTime(DateTimeHelper.getNowDay());
-            dto.setEndTime(DateTimeHelper.getNowDay());
+//            dto.setStartTime(DateTimeHelper.getNowDay());
+//            dto.setEndTime(DateTimeHelper.getNowDay());
             list = mapper.getJdWarnList(dto);
         } catch (Exception e) {
             log.error(e.toString(), e);
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
index b08f070..661d2dd 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml
@@ -182,7 +182,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           LEFT JOIN tb_project tp ON twt.pro_id = tp.id AND tp.del_flag = 0
           WHERE tsb.del_flag = 0 AND tsb.team_id IS NOT NULL AND tb.bid_id IS NOT NULL
         UNION ALL
-          SELECT tpe.id,
+          SELECT CONCAT('zs','-',tpe.id) AS id,
                  CONCAT(tpe.name,'-',tpe.phone) AS label,
                  tp.depart_id AS departId,
                  CONCAT('team','-',tpe.team_id) AS parentId,
@@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           LEFT JOIN tb_project tp ON twt.pro_id = tp.id AND tp.del_flag = 0
           WHERE tb.peopel_type = 0  AND tb.del_flag = 0 AND tb.bid_id IS NOT NULL
         UNION ALL
-            SELECT tlu.id,
+            SELECT CONCAT('ls','-',tlu.id) AS id,
             CONCAT(tlu.name,'-',tlu.phone) AS label,
             tp.depart_id AS departId,
             CONCAT('team','-',tlu.team_id) AS parentId,