From dea44dcd78418ed3e7f191a73cee2b81a7a0019f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 13 一月 2023 16:21:17 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
index bc651ce..f67e152 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
@@ -16,19 +16,19 @@
public interface DeviceAlarmMapper {
@Insert("INSERT INTO device_alarm (deviceId, channelId, alarmPriority, alarmMethod, alarmTime, alarmDescription, longitude, latitude, alarmType , createTime ) " +
- "VALUES ('${deviceId}', '${channelId}', '${alarmPriority}', '${alarmMethod}', '${alarmTime}', '${alarmDescription}', ${longitude}, ${latitude}, '${alarmType}', '${createTime}')")
+ "VALUES (#{deviceId}, #{channelId}, #{alarmPriority}, #{alarmMethod}, #{alarmTime}, #{alarmDescription}, #{longitude}, #{latitude}, #{alarmType}, #{createTime})")
int add(DeviceAlarm alarm);
@Select(value = {" <script>" +
" SELECT * FROM device_alarm " +
" WHERE 1=1 " +
- " <if test=\"deviceId != null\" > AND deviceId = '${deviceId}'</if>" +
- " <if test=\"alarmPriority != null\" > AND alarmPriority = '${alarmPriority}' </if>" +
- " <if test=\"alarmMethod != null\" > AND alarmMethod = '${alarmMethod}' </if>" +
- " <if test=\"alarmType != null\" > AND alarmType = '${alarmType}' </if>" +
- " <if test=\"startTime != null\" > AND alarmTime >= '${startTime}' </if>" +
- " <if test=\"endTime != null\" > AND alarmTime <= '${endTime}' </if>" +
+ " <if test=\"deviceId != null\" > AND deviceId = #{deviceId}</if>" +
+ " <if test=\"alarmPriority != null\" > AND alarmPriority = #{alarmPriority} </if>" +
+ " <if test=\"alarmMethod != null\" > AND alarmMethod = #{alarmMethod} </if>" +
+ " <if test=\"alarmType != null\" > AND alarmType = #{alarmType} </if>" +
+ " <if test=\"startTime != null\" > AND alarmTime >= #{startTime} </if>" +
+ " <if test=\"endTime != null\" > AND alarmTime <= #{endTime} </if>" +
" ORDER BY alarmTime ASC " +
" </script>"})
List<DeviceAlarm> query(String deviceId, String alarmPriority, String alarmMethod,
@@ -38,10 +38,10 @@
@Delete(" <script>" +
"DELETE FROM device_alarm WHERE 1=1 " +
" <if test=\"deviceIdList != null and id == null \" > AND deviceId in " +
- "<foreach collection='deviceIdList' item='item' open='(' separator=',' close=')' > '${item}'</foreach>" +
+ "<foreach collection='deviceIdList' item='item' open='(' separator=',' close=')' > #{item}</foreach>" +
"</if>" +
- " <if test=\"time != null and id == null \" > AND alarmTime <= '${time}'</if>" +
- " <if test=\"id != null\" > AND id = ${id}</if>" +
+ " <if test=\"time != null and id == null \" > AND alarmTime <= #{time}</if>" +
+ " <if test=\"id != null\" > AND id = #{id}</if>" +
" </script>"
)
int clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time);
--
Gitblit v1.8.0