From a1ffb5a84f8424de35a4b913fa40cf880c3b4c7c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 08 十月 2021 09:59:28 +0800
Subject: [PATCH] 报警信息相关修改
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
index c402b27..8af1911 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
@@ -32,7 +32,7 @@
comPropertyAlarm.setCreateTime(DateUtil.date());
comPropertyAlarm.setPhone(comPropertyEquipment.getPhone());
comPropertyAlarm.setSerialNo(comPropertyEquipment.getSerialNo());
- comPropertyAlarm.setType(ComPropertyAlarm.type.one);
+ comPropertyAlarm.setType(ComPropertyAlarm.type.time);
comPropertyAlarm.setCommunityId(comPropertyEquipment.getCommunityId());
comPropertyAlarm.setName(comPropertyEquipment.getUsername());
comPropertyAlarm.setStatus(ComPropertyAlarm.status.dcl);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml
index 97641d9..9d8833a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml
@@ -18,7 +18,7 @@
</resultMap>
<select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
- select t.*,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
+ select t.id,t.serial_no,t.type,t.create_time,t.phone,t1.name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
left join com_property_equipment t1 on t.serial_no = t1.serial_no
left join com_mng_population_house t3 on t1.village_id=t3.id
left join sys_user t2 on t.solve_id = user_id
@@ -37,7 +37,7 @@
and t3.address like concat(#{commonPage.address},'%')
</if>
<if test="commonPage.username !=null and commonPage.username !=''">
- and t.name like concat(#{commonPage.username},'%')
+ and t1.name like concat(#{commonPage.username},'%')
</if>
<if test="commonPage.beginTime !=null">
and t.create_time >=#{commonPage.beginTime}
--
Gitblit v1.7.1