预案短信keyid提交

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/alarm/entity/AlarmLog.java

@@ -58,7 +58,7 @@ public class AlarmLog extends BaseEntity {
     private String nickName;
 
     @ApiModelProperty(value = "用户角色")
-    private String role;
+    private String roleName;
 
     @ApiModelProperty(value = "事件Id")
     private Long keyId;
@@ -144,12 +144,12 @@ public class AlarmLog extends BaseEntity {
         this.nickName = nickName;
     }
 
-    public String getRole() {
-        return role;
+    public String getRoleName() {
+        return roleName;
     }
 
-    public void setRole(String role) {
-        this.role = role;
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
     }
 
     public Long getKeyId() {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/mqtt/MqttConfig.java

@@ -215,7 +215,7 @@ public class MqttConfig {
                             alarmLog.setCreateTime(DateUtils.getNowDate());
                             alarmLog.setKeyId(GroupId);
                             alarmLog.setNickName(userPhoneInfos.get(0).getNickName());
-                            alarmLog.setRole(userPhoneInfos.get(0).getRole());
+                            alarmLog.setRoleName(userPhoneInfos.get(0).getRole());
                             logger.info("写入数据~~~~~~~~~~~~");
                             alarmLogService.insertAlarmLog(alarmLog);
                         }

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

@@ -6,9 +6,12 @@
 
     <resultMap type="com.zd.algorithm.api.alarm.entity.AlarmLog" id="AlarmLogResult">
         <result property="id" column="id"/>
+        <result property="keyId" column="key_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="phone" column="phone"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="role" column="role"/>
         <result property="status" column="status"/>
         <result property="notice" column="notice"/>
         <result property="method" column="method"/>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/AlarmLogMapper.xml

@@ -15,11 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="method" column="method"/>
         <result property="isBack" column="is_back"/>
         <result property="nickName" column="nick_name"/>
-        <result property="role" column="role"/>
+        <result property="roleName" column="role_name"/>
     </resultMap>
 
     <sql id="selectAlarmLogVo">
-        select id, create_time, update_time, phone, status, notice, method, is_back from alarm_log
+        select id, key_id, create_time, update_time, phone, status, notice, method, is_back, nick_name, role_name from alarm_log
     </sql>
     <sql id="selectAlarmLogListVo">
         select t.id, t.create_time, t.update_time, t.phone, t.status, t.notice, t.method, t.is_back from alarm_log as t
@@ -70,8 +70,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAlarmLog" parameterType="com.zd.algorithm.api.alarm.entity.AlarmLog" useGeneratedKeys="true" 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="roleName != null">role_name,</if>
+            <if test="nickName != null">nick_name,</if>
             <if test="phone != null">phone,</if>
             <if test="status != null">status,</if>
             <if test="notice != null">notice,</if>
@@ -79,8 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isBack != null">is_back,</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="roleName != null">#{roleName},</if>
+            <if test="nickName != null">#{nickName},</if>
             <if test="phone != null">#{phone},</if>
             <if test="status != null">#{status},</if>
             <if test="notice != null">#{notice},</if>
@@ -92,8 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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">nike_name = #{nickName},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="status != null">status = #{status},</if>
             <if test="notice != null">notice = #{notice},</if>