From fa9ffa9012d7b1df7692bb99e71be6592f48cd4b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 10 Mar 2021 14:00:19 +0800
Subject: [PATCH] 修改报警器端口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 caf4216..4ae99bd 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
@@ -71,7 +71,15 @@
<if test="alarm.endTime!=null and alarm.endTime!=''">
and a.alarmTime<=#{alarm.endTime}
</if>
- ORDER BY a.alarmTime desc
+ ORDER BY
+ a.jtype ASC,
+ a.alarmTime DESC
+ </select>
+
+ <select id="listAll" resultMap="alarmResultMap">
+ select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
+ a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city
+ from sys_alarm a
</select>
<select id="selectList" resultMap="alarmResultMap">
@@ -106,7 +114,7 @@
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
- <if test="addvcd!=null and addvcd!=''">
+ <if test="district!=null and district!=''">
and a.district=#{district}
</if>
<if test="waringType!=null and waringType!=''">
@@ -121,6 +129,11 @@
ORDER BY id ASC
</select>
+ <select id="getLimit" resultMap="alarmResultMap">
+ select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
+ a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city from sys_alarm a ORDER BY id DESC LIMIT 1
+ </select>
+
<select id="selectInfo" resultMap="alarmResultMap">
SELECT
a.id,
--
Gitblit v1.9.3