告警查询修改

zhongrj

2023-05-27 06cda77e7ec4f053c4ef2077be81133d4452ee1b

告警查询修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java

@@ -16,7 +16,7 @@
    /**
     * 区域编号
     */
    private String areaCode;
    private String areaName;

    /**
     * 测站名称
@@ -52,4 +52,9 @@
     * 告警测站编号
     */
    private String alarmSurveyStationCode;

    /**
     * 测站新旧
     */
    private String alarmSurveyStationNewOld;
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml

@@ -4,11 +4,20 @@

    <!--自定义分页列表查询-->
    <select id="selectAlarmRecordPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordVO">
        select sar.* from sm_alarm_record sar
        select sar.* from sm_alarm_record sar left join sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id
        where is_deleted = 0
        <if test="alarmRecord.alarmSurveyStationName!=null and alarmRecord.alarmSurveyStationName!=''">
            and alarm_survey_station_name like concat(concat('%',#{alarmRecord.alarmSurveyStationName}),'%')
        </if>
        <if test="alarmRecord.type!=null and alarmRecord.type!=''">
            and sar1.type = #{alarmRule.type}
        </if>
        <if test="alarmRecord.alarmRuleType!=null and alarmRecord.alarmRuleType!=''">
            and sar1.alarm_rule_type = #{alarmRecord.alarmRuleType}
        </if>
        <if test="alarmRecord.createAlarmType!=null and alarmRecord.createAlarmType!=''">
            and sar1.create_alarm_type = #{alarmRecord.createAlarmType}
        </if>
    </select>

</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java

@@ -10,4 +10,19 @@
 */
@Data
public class AlarmRecordVO extends AlarmRecord {

    /**
     * 告警分类
     */
    private String type;

    /**
     * 告警规则类型
     */
    private String alarmRuleType;

    /**
     * 生成告警类型
     */
    private String createAlarmType;
}