skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
@@ -14,67 +14,42 @@ public class AlarmRecord extends BaseEntity { /** * 告警分类 * 区域编号 */ private String type; private String areaCode; /** * 告警规则类型 * 测站名称 */ private String alarmRuleType; private String alarmSurveyStationName; /** * 生成告警类型 * 测站类型 */ private String createAlarmType; private String surveyStationType; /** * 校验规则名称 * 处置状态 */ private String ruleName; private String disposeStatus; /** * 校验规则描述 * 告警条件 */ private String ruleRemark; private String alarmCondition; /** * 指标 * 告警规则ID */ private String target; private String alarmRuleId; /** * 阀值 * 水库编号 */ private String threshold; private String reservoirNumber; /** * 告警级别 * 告警测站编号 */ private String alarmLevel; /** * 告警方式 */ private String alarmMode; /** * 告警频次 */ private String alarmFrequency; /** * 告警人 */ private String alarmPerson; /** * 告警内容 */ private String alarmContent; /** * 备注 */ private String alarmRemark; private String alarmSurveyStationCode; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java
@@ -4,6 +4,7 @@ import cn.gistack.sm.alarmRule.vo.AlarmRecordVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,5 +21,5 @@ * @param alarmRecord * @return */ List<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord); List<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page,@Param("alarmRecord") AlarmRecordVO alarmRecord); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
@@ -4,7 +4,11 @@ <!--自定义分页列表查询--> <select id="selectAlarmRecordPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordVO"> select * from sm_alarm_record where is_deleted = 0 select sar.* from sm_alarm_record sar where is_deleted = 0 <if test="alarmRecord.alarmSurveyStationName!=null and alarmRecord.alarmSurveyStationName!=''"> and alarm_survey_station_name like concat(concat('%',#{alarmRecord.alarmSurveyStationName}),'%') </if> </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.xml
@@ -4,33 +4,7 @@ <!--自定义分页列表查询--> <select id="selectAlarmRulePage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleVO"> select a.*, if(waterAlarmRuleType!='',waterAlarmRuleType,if(rainAlarmRuleType!='',rainAlarmRuleType,'')) as alarmRuleTypeName, if(waterCreateAlarmType!='',waterCreateAlarmType,if(rainCreateAlarmType!='',rainCreateAlarmType,'')) as createAlarmTypeName from ( select sar.*, bdb1.dict_value as typeName, bdb2.dict_value as waterAlarmRuleType, bdb3.dict_value as rainAlarmRuleType, bdb4.dict_value as waterCreateAlarmType, bdb5.dict_value as rainCreateAlarmType, bdb6.dict_value as targetName, bdb7.dict_value as alarmLevelName, bdb8.dict_value as alarmModeName, bdb9.dict_value as alarmFrequencyName from YWXT.sm_alarm_rule sar LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'ALARM_TYPE' and dict_key!=-1 and is_deleted = 0) bdb1 on bdb1.dict_key = sar.type LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'WATER_ALARM_RULE_TYPE' and dict_key!=-1 and is_deleted = 0) bdb2 on bdb2.dict_key = sar.ALARM_RULE_TYPE LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'RAIN_ALARM_RULE_TYPE' and dict_key!=-1 and is_deleted = 0) bdb3 on bdb3.dict_key = sar.ALARM_RULE_TYPE LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'WATER_CREATE_ALARM_TYPE' and dict_key!=-1 and is_deleted = 0) bdb4 on bdb4.dict_key = sar.CREATE_ALARM_TYPE LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'RAIN_CREATE_ALARM_TYPE' and dict_key!=-1 and is_deleted = 0) bdb5 on bdb5.dict_key = sar.CREATE_ALARM_TYPE LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'ALARM_TARGET' and dict_key!=-1 and is_deleted = 0) bdb6 on bdb6.dict_key = sar.TARGET LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'ALARM_LEVEL' and dict_key!=-1 and is_deleted = 0) bdb7 on bdb7.dict_key = sar.ALARM_LEVEL LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'ALARM_MODE' and dict_key!=-1 and is_deleted = 0) bdb8 on bdb8.dict_key = sar.ALARM_MODE LEFT JOIN (select * from YWXT.blade_dict_biz where code = 'ALARM_FREQUENCY' and dict_key!=-1 and is_deleted = 0) bdb9 on bdb9.dict_key = sar.ALARM_FREQUENCY where sar.is_deleted = 0 select sar.* from YWXT.sm_alarm_rule sar where sar.is_deleted = 0 <if test="alarmRule.type!=null and alarmRule.type!=''"> and sar.type = #{alarmRule.type} </if> @@ -43,7 +17,6 @@ <if test="alarmRule.ruleName!=null and alarmRule.ruleName!=''"> and sar.rule_name like concat(concat('%',#{alarmRule.ruleName}),'%') </if> ) a </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java
@@ -10,38 +10,4 @@ */ @Data public class AlarmRuleVO extends AlarmRule{ /** * 分类名称 */ private String typeName; /** * 告警规则类型名称 */ private String alarmRuleTypeName; /** * 生成告警类型名称 */ private String createAlarmTypeName; /** * 指标名称 */ private String targetName; /** * 告警等级名称 */ private String alarmLevelName; /** * 告警通知类型名称 */ private String alarmModeName; /** * 告警频次名称 */ private String alarmFrequencyName; }
