From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/dao/SysAlarmDao.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysAlarmDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysAlarmDao.xml
index 3a06d33..3a82152 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysAlarmDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysAlarmDao.xml
@@ -24,13 +24,13 @@
and #{endWarningTime} >= sw.warning_time
</if>
</sql>
- <insert id="insertSysAlarm" parameterType="com.nanometer.smartlab.entity.SysAlarm">
+ <insert id="insertSysAlarm" parameterType="com.nanometer.smartlab.entity.SysAlarm" useGeneratedKeys = "true" keyProperty = "id">
insert into sys_alarm(container_code, warning_id, warning_time, warning_level, controller_code)
values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{controllerCode})
</insert>
-
+
<select id="getSysAlarmList" parameterType="java.util.Map" resultMap="SysAlarm">
- select sw.*,bm2.meta_value as type,sl.name as typeName,bm.meta_value as warningName from sys_alarm as sw
+ select sw.*,bm2.meta_value as type,sl.name as typeName,bm.meta_value as warningName from sys_alarm as sw
left join sys_laboratory_container as slc on sw.container_code = slc.container_code
left join sys_laboratory as sl on slc.laboratory_id = sl.id
left join base_meta as bm on sw.warning_id = bm.id
@@ -44,7 +44,16 @@
</select>
<select id="getSysAlarmTotalCount" parameterType="java.util.Map" resultType="int">
- select count(1) from sys_alarm
+ select count(1) from sys_alarm as sw where 1=1
<include refid="queryWhereSql"/>
</select>
+ <select id="selectOne" resultType="java.lang.Integer">
+ select count(0)
+ from sys_alarm
+ where 1=1 and container_code = #{containerCode}
+ and warning_id = #{warningId}
+ and controller_code =#{controllerCode}
+ and warning_time = #{warningTime}
+
+ </select>
</mapper>
--
Gitblit v1.9.2