From acab32ddf72346f54e7eec802fb6081ab1e0788d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 31 Jul 2023 10:56:08 +0800
Subject: [PATCH] 短信，站内信告警调整（新增近1h水位陡降，陡升，水位超校核洪水位告警，水位接近设计洪水位告警，水位大幅超汛限告警，水位小幅超汛限告警），公用方法调整
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
index a7b825e..673444d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -4,9 +4,13 @@
import cn.gistack.alerts.alarmRule.mapper.AlarmRuleMapper;
import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
+import cn.gistack.system.feign.ISysClient;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 告警规则服务实现层
@@ -15,6 +19,9 @@
*/
@Service
public class AlarmRuleServiceImpl extends BaseServiceImpl<AlarmRuleMapper, AlarmRule> implements AlarmRuleService {
+
+ @Autowired
+ private ISysClient sysClient;
/**
* 自定义分页列表查询
@@ -25,9 +32,11 @@
@Override
public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
if (null != alarmRule.getIsExport()){
- return baseMapper.selectAlarmRulePage(null,alarmRule);
+ List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(null, alarmRule);
+ return alarmRuleVOS;
}
- return page.setRecords(baseMapper.selectAlarmRulePage(page,alarmRule));
+ List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(page, alarmRule);
+ return page.setRecords(alarmRuleVOS);
}
/**
--
Gitblit v1.9.3