告警规则及明细导出修改

zhongrj

2023-05-29 805ddd46115ee16e54d13f484b318974731af2b0

告警规则及明细导出修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java

@@ -77,7 +77,6 @@

    /**
     * 通过id删除
     *
     * @param id
     * @return
     */

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

@@ -18,5 +18,5 @@
     * @param alarmRecord
     * @return
     */
    IPage<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);
    Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord);
}

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

@@ -18,7 +18,7 @@
     * @param alarmRule
     * @return
     */
    IPage<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule);
    Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule);

    /**
     * 通过id查询

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java

@@ -23,7 +23,10 @@
     * @return
     */
    @Override
    public IPage<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
    public Object selectAlarmRecordPage(IPage<AlarmRecordVO> page, AlarmRecordVO alarmRecord) {
        if (null != alarmRecord.getIsExport()){
            return baseMapper.selectAlarmRecordPage(null,alarmRecord);
        }
        return page.setRecords(baseMapper.selectAlarmRecordPage(page,alarmRecord));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java

@@ -23,7 +23,10 @@
     * @return
     */
    @Override
    public IPage<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
    public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
        if (null != alarmRule.getIsExport()){
            return baseMapper.selectAlarmRulePage(null,alarmRule);
        }
        return page.setRecords(baseMapper.selectAlarmRulePage(page,alarmRule));
    }


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

@@ -25,4 +25,9 @@
     * 生成告警类型
     */
    private String createAlarmType;

    /**
     * 是否导出
     */
    private Integer isExport;
}

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

@@ -18,4 +18,10 @@
     * 规则明细
     */
    private List<AlarmRuleDetailVO> alarmRuleDetailList;


    /**
     * 是否导出
     */
    private Integer isExport;
}