From bd959da23dfa97c60fee8c4818384e99d45fc879 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期四, 18 四月 2024 16:51:25 +0800
Subject: [PATCH] 版本:航锦化工    更新日志  1:聚集离开建筑后取消闪烁,2:聚集后产生大屏告警提示,聚集人员离开后大屏不显示告警提示,后台可查询到。

---
 src/main/java/com/hxzk/mapper/WarningDao.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hxzk/mapper/WarningDao.java b/src/main/java/com/hxzk/mapper/WarningDao.java
index aba91a4..b7536b8 100644
--- a/src/main/java/com/hxzk/mapper/WarningDao.java
+++ b/src/main/java/com/hxzk/mapper/WarningDao.java
@@ -10,10 +10,12 @@
 @Repository
 public interface WarningDao extends BaseMapper<TbWarning> {
 
-
-    @Select("SELECT w.id,w.type,w.objectid,w.status,w.time,w.baoliu1,w.baoliu2,w.baoliu3,w.baoliu4,w.baoliu5,w.baoliu6,w.baoliu7,w.baoliu8,w.baoliu9,p.p_name,p.p_phone as pphone,w.baoliu10 FROM `tb_warning` w INNER JOIN tb_person p on p.p_tagid = w.objectid WHERE  w.status = '鏈鐞�' and w.baoliu6 = '0'  ")
+    //闄や簡浜哄憳鑱氶泦绫诲瀷鍏朵粬鍛婅閮借幏鍙�
+    @Select("SELECT w.id,w.type,w.objectid,w.status,w.time,w.baoliu1,w.baoliu2,w.baoliu3,w.baoliu4,w.baoliu5,w.baoliu6,w.baoliu7,w.baoliu8,w.baoliu9,p.p_name,p.p_phone AS pphone,w.baoliu10 FROM `tb_warning` w INNER JOIN tb_person p ON p.p_tagid = w.objectid WHERE  w.status = '鏈鐞�' AND w.baoliu6 = '0' AND w.type <> '浜哄憳鑱氶泦'")
     List<com.hxzk.deo.TbWarning> findDaPingGaoJing();
-
+    //鍙幏鍙栦汉鍛樿仛闆�
+    @Select("SELECT w.id,w.type,w.objectid,w.status,w.time,w.baoliu1,w.baoliu2,w.baoliu3,w.baoliu4,w.baoliu5,w.baoliu6,w.baoliu7,w.baoliu8,w.baoliu9,p.p_name,p.p_phone AS pphone,w.baoliu10,p.baoliu38 FROM `tb_warning` w INNER JOIN tb_person p ON p.p_tagid = w.objectid WHERE  w.status = '鏈鐞�' AND w.baoliu6 = '0'  AND w.`type` = '浜哄憳鑱氶泦' AND p.baoliu38 >1")
+    List<com.hxzk.deo.TbWarning> findDaPingGaoJingRenYuanJuJi();
     @Select("SELECT count(*) FROM `tb_warning`  WHERE DATE(time) = CURDATE() and `status` = '鏈鐞�'")
     Integer findDaPingWeiChuLiCount();
 

--
Gitblit v1.9.3