From aa01896a2e8d8365106314aaead00524199d63ca Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 17 May 2024 17:22:52 +0800
Subject: [PATCH] =?UTF-8?q?ai=E9=A2=84=E8=AD=A6=E5=A4=A7=E5=B1=8Fbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AiAnalyseHardWareAlarmRecordMapper.java   |  3 ++
 .../AiAnalyseHardWareAlarmRecordMapper.xml    | 28 ++++++++++++++-----
 ...AnalyseHardWareAlarmRecordServiceImpl.java | 10 +------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java
index 20d8b0390..89339b4e1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/AiAnalyseHardWareAlarmRecordMapper.java
@@ -7,6 +7,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
 import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
 import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmRecordVo;
+import com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -36,6 +37,8 @@ public interface AiAnalyseHardWareAlarmRecordMapper extends BaseMapper<AiAnalyse
 
     List<SectorOneVo> getAiAnalyseHardWareAlarmTotal(Map<String, Object> map);
 
+    AiAnalyseHardWareAlarmTotalVo countAiAnalyseHardWareAlarmTotal(Map<String, Object> map);
+
     List<AiAnalyseHardWareAlarmRecordVo> selectAiAnalyseHardWareAlarmTypeCount(@Param("param") Map<String, Object> map);
 
     Page<AiAnalyseHardWareAlarmRecordVo> selectAiAnalyseHardWareAlarmTypeCount(@Param("param") Map<String, Object> map, Page<AiAnalyseHardWareAlarmRecordVo> page);
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
index bd3426159..435086bb8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml
@@ -176,17 +176,31 @@
     </sql>
     <select id="getAiAnalyseHardWareAlarmTotal"
             resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
-        SELECT di.name,
-               count(a.id) count,
-               di.data     enumType
-        FROM dictionary_item di
-            LEFT JOIN ai_analyse_hard_ware_alarm_record a on a.alarm_type = di.data and a.project_sn = #{projectSn}
+        SELECT
+        count(a.id) count,
+        a.alarm_type enumType
+        FROM ai_analyse_hard_ware_alarm_record a
+        where 1=1
         <include refid="queryAlarmTime">
         </include>
-        where di.dictionary_encoding = 'ai_analyse_hard_ware_alarm_record_type'
-        group by di.data
+        and a.project_sn = #{projectSn}
+        group by a.alarm_type
         order by count desc
     </select>
+    <select id="countAiAnalyseHardWareAlarmTotal"
+            resultType="com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmTotalVo">
+        SELECT
+        count(a.id) as allAlarmNum,
+        ifnull(sum(if(a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -30 DAY), '%Y-%m-%d'), '
+        00:00:00'),1,0)),0) as past30AlarmNum,
+        ifnull(sum(if(a.create_time >= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), '
+        00:00:00'),1,0)),0) as past7AlarmNum,
+        ifnull(sum(if(a.create_time >= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00'),1,0)),0) as todayAlarmNum
+        FROM ai_analyse_hard_ware_alarm_record a
+        where 1=1
+        and a.project_sn = #{projectSn}
+    </select>
+
     <select id="selectAiAnalyseHardWareAlarmTypeCount"
             resultType="com.zhgd.xmgl.modules.video.entity.vo.AiAnalyseHardWareAlarmRecordVo"
             parameterType="java.util.Map">
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
index ec6739799..f55020eb3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
@@ -438,15 +438,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
 
     @Override
     public AiAnalyseHardWareAlarmTotalVo countAiAnalyseHardWareAlarmTotal(Map<String, Object> map) {
-        AiAnalyseHardWareAlarmTotalVo vo = new AiAnalyseHardWareAlarmTotalVo();
-        vo.setAllAlarmNum(Integer.valueOf(this.getAiAnalyseHardWareAlarmTotal(map).getCount()));
-        map.put("selectType", 3);
-        vo.setTodayAlarmNum(Integer.valueOf(this.getAiAnalyseHardWareAlarmTotal(map).getCount()));
-        map.put("selectType", 1);
-        vo.setPast7AlarmNum(Integer.valueOf(this.getAiAnalyseHardWareAlarmTotal(map).getCount()));
-        map.put("selectType", 2);
-        vo.setPast30AlarmNum(Integer.valueOf(this.getAiAnalyseHardWareAlarmTotal(map).getCount()));
-        return vo;
+        return baseMapper.countAiAnalyseHardWareAlarmTotal(map);
     }
 
     @Override