ai预警大屏bug修改

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);

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,
+        SELECT
         count(a.id) count,
-               di.data     enumType
+        a.alarm_type enumType
-        FROM dictionary_item di
+        FROM ai_analyse_hard_ware_alarm_record a
-            LEFT JOIN ai_analyse_hard_ware_alarm_record a on a.alarm_type = di.data and a.project_sn = #{projectSn}
+        where 1=1
         <include refid="queryAlarmTime">
         </include>
-        where di.dictionary_encoding = 'ai_analyse_hard_ware_alarm_record_type'
+        and a.project_sn = #{projectSn}
-        group by di.data
+        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">

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();
+        return baseMapper.countAiAnalyseHardWareAlarmTotal(map);
-        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;
     }
 
     @Override