From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml
index 34b6b9e..c5bdf3d 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml
@@ -9,11 +9,12 @@
<result property="warningLevel" column="warning_level" typeHandler="com.nanometer.smartlab.entity.handler.WarningLevelHandler"></result>
<result property="userId" column="user_id"></result>
<result property="warningPoint" column="warning_point"></result>
+ <result property="refId" column="daping_alarm_id"/>
</resultMap>
<insert id="insertSysAlarmPerson" parameterType="com.nanometer.smartlab.entity.SysAlarmPerson">
- insert into sys_warning(container_code, warning_id, warning_time, warning_level, user_id, warning_point,daping_alarm_id)
- values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{userId}, #{warningPoint},#{refId} )
+ insert into sys_warning(container_code, warning_id, warning_time, warning_level, user_id, warning_point,daping_alarm_id,memo)
+ values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{userId}, #{warningPoint},#{refId},#{memo} )
</insert>
@@ -24,5 +25,14 @@
and warning_time = #{warningTime}
and warning_level = #{warningLevel}
</select>
-
+ <select id="selectByCode" resultType="com.nanometer.smartlab.entity.SysAlarmPerson">
+ select
+ id,
+ container_code as containerCode,
+ warning_id as warningId,
+ daping_alarm_id as refId
+ from sys_warning
+ where container_code = #{containerCode}
+ and warning_id = #{warningId}
+ </select>
</mapper>
--
Gitblit v1.9.2