预案短信keyid提交3

zd-modules/zd-algorithm/src/main/resources/mapper/alarm/AlarmLogMapper.xml

@@ -11,7 +11,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="phone" column="phone"/>
         <result property="nickName" column="nick_name"/>
-        <result property="role" column="role"/>
+        <result property="roleName" column="role_name"/>
         <result property="status" column="status"/>
         <result property="notice" column="notice"/>
         <result property="method" column="method"/>
@@ -20,8 +20,11 @@
 
     <sql id="selectAlarmLogVo">
         select id,
+               key_id,
                create_time,
                update_time,
+               role_name,
+               nick_name,
                phone,
                status,
                notice,
@@ -31,8 +34,11 @@
     </sql>
     <sql id="selectAlarmLogListVo">
         select t.id,
+               t.key_id,
                t.create_time,
                t.update_time,
+               t.role_name,
+               t.nick_name,
                t.phone,
                t.status,
                t.notice,
@@ -67,8 +73,11 @@
             keyProperty="id">
         insert into alarm_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="keyId != null">key_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="nickName != null">nick_name,</if>
+            <if test="roleName != null">role_name,</if>
             <if test="phone != null">phone,</if>
 
             <if test="status != null">status,</if>
@@ -82,8 +91,11 @@
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="keyId != null">#{keyId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="nickName != null">#{nickName},</if>
+            <if test="roleName != null">#{roleName},</if>
             <if test="phone != null">#{phone},</if>
             <if test="status != null">#{status},</if>
             <if test="notice != null">#{notice},</if>
@@ -96,8 +108,11 @@
     <update id="updateAlarmLog" parameterType="com.zd.algorithm.api.alarm.entity.AlarmLog">
         update alarm_log
         <trim prefix="SET" suffixOverrides=",">
+            <if test="keyId != null">key_id = #{keyId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="roleName != null">role_name = #{roleName},</if>
+            <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="status != null">status = #{status},</if>
             <if test="notice != null">notice = #{notice},</if>

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -113,8 +113,8 @@ public class WarningNoticeLogController extends AbstractController {
 
     @GetMapping("/getRemindData")
     @ApiOperation("根据keyId获取过期提醒次数")
-    public ResultData getRemindData(@RequestParam(name = "keyId 各类型id",value = "keyId") Long keyId,
-                                    @RequestParam(name = "预警类型(1算法识别 2化学品 3气瓶 4预案)",value = "type") Integer type) {
+    public ResultData getRemindData(@RequestParam(value = "keyId") Long keyId,
+                                    @RequestParam(value = "type") Integer type) {
         List<WarningNoticeLog> list = warningNoticeLogService.list(new LambdaQueryWrapper<WarningNoticeLog>().eq(WarningNoticeLog::getKeyId, keyId).eq(WarningNoticeLog::getWarningType,type).eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE));
         List<WarningNoticeLogDto> warningNoticeLogDtos = com.zd.common.core.utils.BeanUtils.copyList2List(list, WarningNoticeLogDto.class);
         return ResultData.success(warningNoticeLogDtos);