From 90d9cd8ac8d7575d1cbd6e81ff6ed746ee82289f Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期二, 17 十月 2023 09:23:45 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 28a2e91..589e6f2 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceAlarmMapper.java
@@ -4,6 +4,7 @@
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
@@ -32,8 +33,8 @@
" <if test=\"endTime != null\" > AND alarm_time <= #{endTime} </if>" +
" ORDER BY alarm_time ASC " +
" </script>"})
- List<DeviceAlarm> query(String deviceId, String alarmPriority, String alarmMethod,
- String alarmType, String startTime, String endTime);
+ List<DeviceAlarm> query(@Param("deviceId") String deviceId, @Param("alarmPriority") String alarmPriority, @Param("alarmMethod") String alarmMethod,
+ @Param("alarmType") String alarmType, @Param("startTime") String startTime, @Param("endTime") String endTime);
@Delete(" <script>" +
@@ -45,5 +46,5 @@
" <if test=\"id != null\" > AND id = #{id}</if>" +
" </script>"
)
- int clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time);
+ int clearAlarmBeforeTime(@Param("id") Integer id, @Param("deviceIdList") List<String> deviceIdList, @Param("time") String time);
}
--
Gitblit v1.8.0