From f4772c7799e0d38f5ec0566a5e44110a960248a3 Mon Sep 17 00:00:00 2001
From: SuiXxx <1752599835@qq.com>
Date: Mon, 23 Sep 2024 20:19:38 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E9=A2=84=E8=AD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/controller/WarnRuleController.java  |  6 +++---
 .../src/main/java/com/muyu/domain/WarnRule.java  | 16 ++++++++++------
 .../java/com/muyu/mapper/WarnRuleMapper.java     |  2 +-
 .../java/com/muyu/service/WarnRuleService.java   |  2 +-
 .../muyu/service/impl/WarnRuleServiceImpl.java   |  4 ++--
 .../src/main/resources/mapper/WarnRuleMapper.xml |  6 ++++--
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java
index b40228b..9071020 100644
--- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java
+++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java
@@ -34,10 +34,10 @@ public class WarnRuleController extends BaseController
     /**
      * 查询预警规则列表
      */
-    @GetMapping("/selectWarnRuleResplist")
-    public Result selectWarnRuleResplist()
+    @GetMapping("/selectWarnRuleRespList")
+    public Result selectWarnRuleRespList()
     {
-        return Result.success(warnRuleService.selectWarnRuleResplist());
+        return Result.success(warnRuleService.selectWarnRuleRespList());
     }
 
     /**
diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java
index 666ff35..cbf8174 100644
--- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java
+++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java
@@ -46,13 +46,17 @@ public class WarnRule {
     @Excel(name = "滑窗频率")
     private Long slideFrequency;
 
-    /** 最大值 */
-    @Excel(name = "最大值")
-    private Long maxValue;
+    /** 上升率 */
+    @Excel(name = "上升率")
+    private Long growthRate;
 
-    /** 最小值 */
-    @Excel(name = "最小值")
-    private Long minValue;
+    /** 波动率 */
+    @Excel(name = "波动率")
+    private Long volatilityRate;
+
+    /** 下降率 */
+    @Excel(name = "下降率")
+    private Long decreaseRate;
 
 
 }
diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java
index 6a55569..4799830 100644
--- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java
+++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java
@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Param;
 public interface WarnRuleMapper extends BaseMapper<WarnRule>{
 
     //规则列表
-    List<WarnRuleResp> selectWarnRuleResplist();
+    List<WarnRuleResp> selectWarnRuleRespList();
 
     //根据策略ID查规则
     List<WarnRuleResp> selectListByStrategyId(@Param("strategyId")Long strategyId);
diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java
index 9ab98b8..b9df314 100644
--- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java
+++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java
@@ -25,7 +25,7 @@ public interface WarnRuleService extends IService<WarnRule> {
      * 查询预警规则列表
      * @return 预警规则集合
      */
-    List<WarnRuleResp> selectWarnRuleResplist();
+    List<WarnRuleResp> selectWarnRuleRespList();
 
 
     /**
diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java
index 9fe146e..ed960d7 100644
--- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java
+++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java
@@ -45,9 +45,9 @@ public class WarnRuleServiceImpl
      * @return 预警规则
      */
     @Override
-    public List<WarnRuleResp> selectWarnRuleResplist()
+    public List<WarnRuleResp> selectWarnRuleRespList()
     {
-        return warnRuleMapper.selectWarnRuleResplist();
+        return warnRuleMapper.selectWarnRuleRespList();
     }
 
     @Override
diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml
index 1487843..c1e0045 100644
--- a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml
+++ b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml
@@ -13,9 +13,11 @@
                  LEFT JOIN message_template_type ON warn_rule.msg_type_id=message_template_type.message_template_type_id
         WHERE warn_rule.strategy_id=#{strategyId}
     </select>
-    <select id="selectWarnRuleResplist" resultType="com.muyu.domain.resp.WarnRuleResp">
-        SELECT * ,warn_strategy.strategy_name
+    <select id="selectWarnRuleRespList" resultType="com.muyu.domain.resp.WarnRuleResp">
+        SELECT * ,warn_strategy.strategy_name,
+               message_template_type.message_field
         FROM `warn_rule`
                  LEFT JOIN warn_strategy ON warn_rule.strategy_id=warn_strategy.id
+                 LEFT JOIN message_template_type ON warn_rule.msg_type_id=message_template_type.message_template_type_id
     </select>
 </mapper>