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

guoshilong

2023-06-02 458eba2d12e1c45ffd019c4b624c6fbc6e843add

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

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

@@ -14,11 +14,6 @@
public class AlarmRecord extends BaseEntity {

    /**
     * 区域名称
     */
    private String areaName;

    /**
     * 测站名称
     */
    private String alarmSurveyStationName;
@@ -47,11 +42,6 @@
     * 水库编号
     */
    private String reservoirNumber;

    /**
     * 水库名称
     */
    private String reservoirName;

    /**
     * 告警测站编号

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

@@ -6,14 +6,18 @@
    <select id="selectAlarmRecordPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordVO">
        select
        sar.*,
        sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType
        from sm_alarm_record sar left join sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id and sar1.is_deleted = 0
        sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,
        arb."name" as reservoirName,aab."ad_name" as areaName
        from YWXT.sm_alarm_record sar
        left join YWXT.sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id and sar1.is_deleted = 0
        left join SJZT_MD."att_res_base" arb on arb."guid" = sar.reservoir_number
        left join SJZT_MD."att_ad_base" aab on aab."guid" = arb."interior_ad_guid"
        where sar.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.reservoirName!=null and alarmRecord.reservoirName!=''">
            and reservoir_name like concat(concat('%',#{alarmRecord.reservoirName}),'%')
            and sar.reservoir_name like concat(concat('%',#{alarmRecord.reservoirName}),'%')
        </if>
        <if test="alarmRecord.type!=null and alarmRecord.type!=''">
            and sar1.type = #{alarmRecord.type}

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

@@ -12,6 +12,16 @@
public class AlarmRecordVO extends AlarmRecord {

    /**
     * 区域名称
     */
    private String areaName;

    /**
     * 水库名称
     */
    private String reservoirName;

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

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeController.java

@@ -18,17 +18,17 @@

    private final NoticeStrategyContext applicationContext;

//    /**
//     * 调用任务通知
//     * @param type 策略分类
//     * @param name 任务名称
//     * @param content 内容（可以不传）
//     * @return
//     */
//    @GetMapping("/toNotice")
//    public Object toNotice(String type,String name,String content){
//        return applicationContext.doSomethingByStrategy(name, content, type);
//    }
    /**
     * 调用任务通知
     * @param type 策略分类
     * @param name 任务名称
     * @param content 内容（可以不传）
     * @return
     */
    @GetMapping("/toNotice")
    public Object toNotice(String type,String name,String content){
        return applicationContext.doSomethingByStrategy(name, content, type);
    }


}