From 9ba9a7d6d5124cfd0f09fcd114678b9eeafef30e Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Tue, 3 May 2022 13:48:27 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=9B=91=E6=8E=A7=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=91=8A=E8=AD=A6=E7=BB=9F=E8=AE=A1=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E7=9B=B4=E6=8E=A5=E5=92=8C1.2?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=9A=84=E5=91=8A=E8=AD=A6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=8C=82=E9=92=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/iot/IndexController.java  |  2 +-
 .../ruoyi/system/mapper/BaseAlarmModuleMapper.java |  9 +++++++++
 .../system/service/IBaseAlarmModuleService.java    |  8 ++++++++
 .../service/impl/BaseAlarmModuleServiceImpl.java   |  5 +++++
 .../mapper/system/BaseAlarmModuleMapper.xml        | 14 ++++++++++++++
 5 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java
index 7da267b..73d2f00 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java
@@ -360,7 +360,7 @@ public class IndexController {
     List<Integer> data = new ArrayList<>();
 
     List<BaseAlarmModuleDto> baseAlarmModuleDtos =
-        baseAlarmModuleService.selectAlarmModuleAmountList(new BaseAlarmModule());
+        baseAlarmModuleService.selectAlarmCategoryAmountList(new BaseAlarmModule());
 
     if (baseAlarmModuleDtos.size() > 0) {
       baseAlarmModuleDtos.forEach(
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseAlarmModuleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseAlarmModuleMapper.java
index 7ca5a24..ea53ceb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseAlarmModuleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseAlarmModuleMapper.java
@@ -69,4 +69,13 @@ public interface BaseAlarmModuleMapper
      */
     public List<BaseAlarmModuleDto> selectAlarmModuleAmountList(BaseAlarmModule baseAlarmModule);
 
+    /**
+     * 查詢告警类别数量
+     * @author WenJY
+     * @date 2022/5/3 13:45
+     * @param baseAlarmModule
+     * @return java.util.List<com.ruoyi.system.domain.dto.BaseAlarmModuleDto>
+     */
+    public List<BaseAlarmModuleDto> selectAlarmCategoryAmountList(BaseAlarmModule baseAlarmModule);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseAlarmModuleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseAlarmModuleService.java
index e4f7687..f58eacf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseAlarmModuleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseAlarmModuleService.java
@@ -69,4 +69,12 @@ public interface IBaseAlarmModuleService
      */
     public List<BaseAlarmModuleDto> selectAlarmModuleAmountList(BaseAlarmModule baseAlarmModule);
 
+    /**
+     * 查詢告警类别数量
+     * @author WenJY
+     * @date 2022/5/3 13:45
+     * @param baseAlarmModule
+     * @return java.util.List<com.ruoyi.system.domain.dto.BaseAlarmModuleDto>
+     */
+    public List<BaseAlarmModuleDto> selectAlarmCategoryAmountList(BaseAlarmModule baseAlarmModule);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseAlarmModuleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseAlarmModuleServiceImpl.java
index da830b8..b54b7d3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseAlarmModuleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseAlarmModuleServiceImpl.java
@@ -105,4 +105,9 @@ public class BaseAlarmModuleServiceImpl implements IBaseAlarmModuleService
     public List<BaseAlarmModuleDto> selectAlarmModuleAmountList(BaseAlarmModule baseAlarmModule) {
         return baseAlarmModuleMapper.selectAlarmModuleAmountList(baseAlarmModule);
     }
+
+    @Override
+    public List<BaseAlarmModuleDto> selectAlarmCategoryAmountList(BaseAlarmModule baseAlarmModule) {
+        return baseAlarmModuleMapper.selectAlarmCategoryAmountList(baseAlarmModule);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml
index 86cd38c..8dc39d0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseAlarmModuleMapper.xml
@@ -157,4 +157,18 @@
         order by t1.Order_Flag
     </select>
 
+    <select id="selectAlarmCategoryAmountList" parameterType="BaseAlarmModule" resultMap="BaseAlarmModuleDtoResult">
+        select a.AlarmModule_Text,sum(a.alarmModuleAmount) as alarmModuleAmount
+        from (select t5.AlarmCategory_Name as AlarmModule_Text,count(t4.Alarm_Value) as alarmModuleAmount
+              from base_alarm_module t1
+                       left join base_monitorunit_info t2 on t2.MonitorUnit_Type = t1.MonitorUnit_Id
+                       left join base_sensor_info t3 on t2.MonitorUnit_Id = t3.MonitorUnit_Id
+                       left join record_alarm t4 on t3.Sensor_Id = t4.Sensor_Id and t1.AlarmType_Id = t4.AlarmType_Id
+                       left join base_alarm_category t5 on t1.AlarmCategory_Id = t5.AlarmCategory_Id
+              where t5.AlarmCategory_Id is not null
+              group by t1.AlarmModule_Text,t1.Order_Flag,t5.AlarmCategory_Name
+              order by t1.Order_Flag) a
+        group by a.AlarmModule_Text
+    </select>
+
 </mapper>
\ No newline at end of file