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/PersonDao.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/hxzk/mapper/PersonDao.java b/src/main/java/com/hxzk/mapper/PersonDao.java
index 7ab4ece..29386a3 100644
--- a/src/main/java/com/hxzk/mapper/PersonDao.java
+++ b/src/main/java/com/hxzk/mapper/PersonDao.java
@@ -12,6 +12,9 @@
@Select("select p.id,p.p_name,p.p_tagid,p.p_sex,p.p_minzu,p.p_phone,p.p_department,p.p_ban,p.p_zu,p.p_idcardnum,p.p_adress,p.p_canin,p.p_x,p.p_y,p.p_floor,p.p_sos,p.p_online,p.p_power,p.p_kaoqing,p.p_fence,p.p_fencename,p.p_kaoqqingname,p.p_image,p.p_addtiem,p.p_power_wanig,p.p_sousuo,p.p_shipin,p.p_shipingname,p.baoliu1,p.baoliu2,p.baoliu3,p.baoliu4,p.baoliu5,p.baoliu6,p.baoliu7,p.baoliu8,p.baoliu9,p.baoliu10,p.baoliu11,p.baoliu12,p.baoliu13,p.baoliu14,p.baoliu15,p.baoliu16,p.baoliu17,p.baoliu18,p.baoliu19,p.baoliu20,p.baoliu21,p.baoliu22,p.baoliu23,p.baoliu24,p.baoliu25,p.baoliu26,p.baoliu27,p.baoliu28,p.baoliu29,p.baoliu30,p.baoliu31,p.baoliu32,p.baoliu33,p.baoliu34,p.baoliu35,p.baoliu36,p.baoliu37,p.baoliu38,p.baoliu39,p.baoliu40,t.version as version from tb_person p INNER JOIN tb_tag t on t.tag_id = p.p_tagid where p.baoliu19 = '铻嶅悎缁堢' or p.baoliu19 ='绯荤粺榛樿' or p.baoliu19 = 'lora鏍囩' order by p.p_online desc")
List<com.hxzk.deo.TbPerson> findAlls();
+ @Select("SELECT p.*,g.gps_kahao AS baoliu40 FROM `tb_person` p INNER JOIN tb_gps g on g.tagid = p.p_tagid where p.baoliu19 = '铻嶅悎缁堢' or p.baoliu19 = '绯荤粺榛樿' or p.baoliu19 = 'lora鏍囩' OR p.baoliu19 = '闃叉挒鏍囩'")
+ List<TbPerson> findPersonAll();
+
@Select("SELECT p.id,p.p_name,p.p_tagid,p.p_sex,p.p_minzu,p.p_phone,p.p_department,p.p_ban,p.p_zu,p.p_idcardnum,p.p_adress,p.p_canin,p.p_x,p.p_y,p.p_floor,p.p_sos,p.p_online,p.p_power,p.p_kaoqing,p.p_fence,p.p_fencename,p.p_kaoqqingname,p.p_image,p.p_addtiem,p.p_power_wanig,p.p_sousuo,p.p_shipin,p.p_shipingname,p.baoliu1,p.baoliu2,p.baoliu3,p.baoliu4,p.baoliu5,p.baoliu6,p.baoliu7,p.baoliu8,p.baoliu9,p.baoliu10,p.baoliu11,p.baoliu12,p.baoliu13,p.baoliu14,p.baoliu15,p.baoliu16,p.baoliu17,p.baoliu18,p.baoliu19,p.baoliu20,p.baoliu21,p.baoliu22,p.baoliu23,p.baoliu24,p.baoliu25,p.baoliu26,p.baoliu27,p.baoliu28,p.baoliu29,p.baoliu30,p.baoliu31,p.baoliu32,p.baoliu33,p.baoliu34,p.baoliu35,p.baoliu36,p.baoliu37,p.baoliu38,p.baoliu39,p.baoliu40,t.version AS VERSION FROM tb_person p INNER JOIN tb_tag t ON t.tag_id = p.p_tagid WHERE p.p_tagid like #{pTagid} or p.p_name like #{pTagid} order by p.p_online desc")
List<com.hxzk.deo.TbPerson> findAllsearch(com.hxzk.deo.TbPerson person);
@@ -28,13 +31,25 @@
List<TbPersonAndDepartment> findAllBuMenOffOnline();
//浜岀淮
- @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_floor = #{floor} and p.p_online = 1")
+ @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName WHERE p.p_floor = 0 AND p.p_online = 1 AND p_kaoqing = 1")
List<TbPersonAndDepartment> findAllBuMen1(String floor);
- //涓夌淮
- @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName")
+ //涓夌淮鍦ㄧ嚎
+ @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_online = 1")
List<TbPersonAndDepartment> findAllBuMen2();
+
+
+ //涓夌淮绂荤嚎
+ @Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_kaoqing = 1")
+ List<TbPersonAndDepartment> findAllBuMen3();
@Select("SELECT p.*, d.departmentName AS bumen1, d.baoliu5 AS bumencolor FROM tb_person p INNER JOIN tb_department d ON p.p_department = d.departmentName where p.p_tagid = #{pTagid} or p.p_name = #{pName}")
TbPersonAndDepartment findOnePerson(TbPersonAndDepartment personAndDepartment);
+
+
+ @Select("SELECT COUNT(*) AS p_name, baoliu39 FROM `tb_person` where p_online = '1' GROUP BY baoliu39")
+ List<TbPerson> FindShowJianZhu();
+
+ @Select("SELECT COUNT(*) AS p_name FROM `tb_person` where baoliu39 = #{baoliu39}")
+ List<TbPerson> FindShowJianZhuStop();
}
--
Gitblit v1.9.3