From c0892e033a19c4a481db5d661df542e30cff3ce4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 06 Apr 2021 14:31:16 +0800
Subject: [PATCH] 设备全查接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 64fe725..0a5e246 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -32,13 +32,14 @@
<result column="name" property="name"/>
<result column="cid" property="cid"/>
<result column="vaddress" property="vaddress"/>
+ <result column="aaddress" property="aaddress"/>
</resultMap>
<select id="selectAlarmPage" resultMap="alarmResultMap">
select
a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
- a.deviceNumber,a.region,a.district,a.vaddress,
+ a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
@@ -327,6 +328,7 @@
) b
on
a.click_date = b.datetime
+ order by a.click_date asc
</select>
@@ -432,4 +434,9 @@
<update id="updateVaddress">
update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
</update>
+
+
+ <select id="selectEq" resultType="java.util.HashMap">
+ SELECT COUNT(deviceNumber) as cou,deviceNumber FROM `sys_alarm` WHERE alarmTime like concat(concat('%', #{time}), '%') and waringType NOT IN("系统测试","主机重新上电") group by deviceNumber
+ </select>
</mapper>
--
Gitblit v1.9.3