Merge remote-tracking branch 'origin/dev' into dev

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsAlarmInfo.java

@@ -42,6 +42,11 @@ public class KwsAlarmInfo implements Serializable {
      */
 
     private String valueDesc;
+    /**
+     * 手机号或邮箱
+     */
+
+    private String alias;
 
     /**
      * 创建时间

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmInfoService.java

@@ -86,6 +86,7 @@ public class KwsAlarmInfoService {
                 alarmInfo.setCreateTime(now);
                 alarmInfo.setLevel(Integer.parseInt(obj.get("level").toString()));
                 alarmInfo.setValueDesc(obj.get("value_desc").toString());
+                alarmInfo.setAlias(obj.get("alias").toString());
                 alarmInfo.setType(Integer.parseInt(obj.get("type").toString()));
                 alarmInfo.setCreateTime(now);
                 alarmInfo.setUpdateTime(now);

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsAlarmInfoMapper.xml

@@ -16,7 +16,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, mountain_id, company_id, `level`, `type`, value_desc, create_time, update_time, 
+    id, mountain_id, company_id, `level`, `type`, value_desc, create_time, update_time, alias,
     del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -33,6 +33,7 @@
     <include refid="Base_Column_List" />
     from kws_alarm_info
     where del_flag=0
+    order by level
   </select>
 
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -44,11 +45,11 @@
     <!--@mbg.generated-->
     insert into kws_alarm_info (id, mountain_id, company_id, 
       `level`, `type`, value_desc, 
-      create_time, update_time, del_flag
+      create_time, update_time, del_flag,alias
       )
     values (#{id,jdbcType=BIGINT}, #{mountainId,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, 
       #{level,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{valueDesc,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, #{alias,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.sckw.slope.detection.model.dos.mysql.KwsAlarmInfo">