From 08c7fcce9fa2a876412fa81a19550b77996214e2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 20:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
index 9b68c3c..c385065 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
@@ -1,9 +1,12 @@
package cn.gistack.sm.alarmRule.mapper;
import cn.gistack.sm.alarmRule.entity.AlarmRule;
+import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO;
import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,8 +20,22 @@
/**
* 自定义分页列表查询
* @param page
- * @param alarmRecord
+ * @param alarmRule
* @return
*/
- List<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule);
+ List<AlarmRuleVO> selectAlarmRulePage(IPage<AlarmRuleVO> page,@Param("alarmRule") AlarmRuleVO alarmRule);
+
+ /**
+ * 通过id查询
+ * @param id
+ * @return
+ */
+ AlarmRuleVO getDetailById(@Param("id") String id);
+
+ /**
+ * 查询告警规则详情信息
+ * @param id 告警规则id
+ * @return
+ */
+ List<AlarmRuleDetailVO> getAlarmRuleDetailList(@Param("id") String id);
}
--
Gitblit v1.9.3