From dacae5af651baa6ae102c8dd4350a7b8b7d86fe6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 28 Apr 2022 16:16:40 +0800
Subject: [PATCH] 通过时间和mac集合查询数据接口，修改蜂窝图小时数据接口
---
screen-api/src/main/resources/mapper/AlarmInfoMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml b/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml
index 187b2e5..d49905f 100644
--- a/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml
+++ b/screen-api/src/main/resources/mapper/AlarmInfoMapper.xml
@@ -32,6 +32,24 @@
limit #{start},#{size}
</select>
+ <select id="selectDataByConditionWithoutPage" resultType="java.util.Map">
+ select ai.id alarmInfoId,ai.alarm_time,ai.index,ai.alarm_type,ai.alarm_information,d.id deviceId,d.name deviceName,d.longitude,d.latitude
+ from alarm_info ai, device d
+ where ai.device_id in
+ <foreach collection="deviceIds" item="deviceId" index="index" open="(" close=")" separator=",">
+ #{deviceId}
+ </foreach>
+ and d.id = ai.device_id
+ <if test="index != null">
+ and ai.index = #{index}
+ </if>
+ <if test="alarmType != null">
+ and ai.alarm_type = #{alarmType}
+ </if>
+ and alarm_time between #{startTime} and #{endTime}
+ ORDER by ai.create_time DESC
+ </select>
+
<select id="selectNewestData" resultType="java.util.Map">
select ai.id alarmInfoId,ai.alarm_time,ai.index,ai.alarm_type,ai.alarm_information,d.id deviceId,d.name deviceName,d.longitude,d.latitude
from alarm_info ai, device d
--
Gitblit v1.8.0