设备告警添加 5.'db_alarm.tb_devalarm_data'新增告警重要等级 `alm_severity` int(11)...

lxw

2023-06-14 aeb0ace61fb2ff28c319f21f3b943d495f2371ad

设备告警添加	5.'db_alarm.tb_devalarm_data'新增告警重要等级
      		`alm_severity` int(11) NOT NULL DEFAULT '0' COMMENT '告警重要等级[0:重要；1:紧急]'

      	6.'db_alarm.tb_devalarm_data_history'新增告警重要等级
      		`alm_severity` int(11) NOT NULL DEFAULT '0' COMMENT '告警重要等级[0:重要；1:紧急]'

 src/main/java/com/whyc/pojo/DevalarmData.java

@@ -84,4 +84,8 @@
    @ApiModelProperty("用户推送记录时间")
    private Date recordTime;

    @TableField("alm_severity")
    @ApiModelProperty(value = "告警重要等级[0:重要；1:紧急]")
    private Integer almSeverity;

}

 src/main/java/com/whyc/pojo/DevalarmDataHistory.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -74,4 +75,8 @@
    @TableField(exist = false)
    private String recordYear;

    @TableField("alm_severity")
    @ApiModelProperty(value = "告警重要等级[0:重要；1:紧急]")
    private Integer almSeverity;

}

 src/main/java/com/whyc/service/BattalarmDataService.java

@@ -362,6 +362,7 @@
                data.setAlmStartTime(ddata.getAlmStartTime());
                //data.setAlm_signal_id(ddata.getAlm_type());
                data.setAlarmName(MessageUtils.getMessageSocket(AlarmDaoFactory.getdevName(ddata.getAlmType()), lang));
                data.setAlmSeverity(ddata.getAlmSeverity());
                lista.add(data);
            }
        }
@@ -379,6 +380,7 @@
                data.setNum(pAlarm.getNum());
                data.setAlmStartTime(pAlarm.getAlmStartTime());
                data.setAlarmName(AlarmDaoFactory.getAllAlarmName(pAlarm.getAlmType()));
                data.setAlmSeverity(pAlarm.getAlmSeverity());
                lista.add(data);
            }
        }

 src/main/resources/mapper/DevalarmDataHistoryMapper.xml

@@ -14,13 +14,14 @@
        <result property="almClearedType" column="alm_cleared_type"></result>
        <result property="devName" column="dev_name"></result>
        <result property="stationName" column="stationName"></result>

        <result property="almSeverity" column="alm_severity"></result>

    </resultMap>

    <select id="serchByCondition" resultMap="devAlarmRes">
        SELECT  distinct tb_devalarm_data_history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,
        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName  as dev_name
        SELECT distinct
        tb_devalarm_data_history.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity,
        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.FbsDeviceName as dev_name
        FROM db_alarm.tb_devalarm_data_history,db_battinf.tb_battinf
        <where>
            tb_devalarm_data_history.dev_id=db_battinf.tb_battinf.FbsDeviceId

 src/main/resources/mapper/DevalarmDataMapper.xml

@@ -15,12 +15,12 @@
        <result property="devName" column="dev_name"></result>
        <result property="stationName" column="stationName"></result>
        <result property="stationId" column="stationId"></result>

        <result property="almSeverity" column="alm_severity"></result>
    </resultMap>

    <select id="serchByInfo" resultMap="devAlarmRes">
        SELECT distinct
        tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,
        tb_devalarm_data.num,dev_id,dev_ip,alm_type,alm_level,alm_start_time,alm_end_time,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,alm_severity,
        db_battinf.tb_battinf.stationName,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.FbsDeviceName as
        dev_name
        FROM db_alarm.tb_devalarm_data,db_battinf.tb_battinf
@@ -66,17 +66,34 @@
        and db_user.tb_user_inf.uid=#{uid} )
    </select>
    <select id="getRealAlarm" resultType="com.whyc.pojo.DevalarmData">
        select distinct db_alarm.tb_devalarm_data.num,db_alarm.tb_devalarm_data.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationname3,db_battinf.tb_battinf.stationid,db_battinf.tb_battinf.fbsdevicename,dev_ip,alm_level,alm_type,alm_start_time
        from db_alarm.tb_devalarm_data,db_battinf.tb_battinf
        where alm_cleared_type=0
        and alm_is_confirmed = 0
        and alm_start_time >= #{yesterday}
        and db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.fbsdeviceid
        and  db_alarm.tb_devalarm_data.dev_id  in (select distinct db_battinf.tb_battinf.FbsDeviceId
        from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
        where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId
        and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
        and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid
        select distinct db_alarm.tb_devalarm_data.num,
                        db_alarm.tb_devalarm_data.dev_id,
                        db_battinf.tb_battinf.stationname,
                        db_battinf.tb_battinf.stationname3,
                        db_battinf.tb_battinf.stationid,
                        db_battinf.tb_battinf.fbsdevicename,
                        dev_ip,
                        alm_level,
                        alm_type,
                        alm_start_time,
                        alm_severity
        from db_alarm.tb_devalarm_data,
             db_battinf.tb_battinf
        where alm_cleared_type = 0
          and alm_is_confirmed = 0
          and alm_start_time >= #{yesterday}
          and db_alarm.tb_devalarm_data.dev_id = db_battinf.tb_battinf.fbsdeviceid
          and db_alarm.tb_devalarm_data.dev_id in (select distinct db_battinf.tb_battinf.FbsDeviceId
                                                   from db_battinf.tb_battinf,
                                                        db_user.tb_user_battgroup_baojigroup_battgroup,
                                                        db_user.tb_user_battgroup_baojigroup_usr,
                                                        db_user.tb_user_inf
                                                   where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId =
                                                         db_battinf.tb_battinf.BattGroupId
                                                     and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
                                                         db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
                                                     and db_user.tb_user_inf.uid =
                                                         db_user.tb_user_battgroup_baojigroup_usr.uid
        and db_user.tb_user_inf.uid=#{uId})
        order by alm_start_time desc
    </select>