From 9d33bd0fa6b661167147765a7cc75d458e653620 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 13 May 2024 11:03:04 +0800
Subject: [PATCH] =?UTF-8?q?AI=E9=A2=84=E8=AD=A6=E7=B1=BB=E5=9E=8B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/video/controller/AiStatisticController.java   | 2 +-
 .../mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml     | 6 +++---
 .../video/service/impl/AiStatisticServiceImpl.java        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java
index 415731345..ec04e52f9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiStatisticController.java
@@ -44,7 +44,7 @@ public class AiStatisticController {
     @ApiOperation(value = "AI预警类型统计", notes = "AI预警类型统计")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "sn", value = "公司或项目sn", paramType = "body", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "type", value = "默认查今日，1查今天、今天较昨天、本月、历史", paramType = "body", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "type", value = "0默认查今日，1查今天、今天较昨天、本月、历史", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping("/selectAiAnalyseHardWareAlarmTypeCount")
     public Result<AiAnalyseHardWareAlarmTypeCountVO> selectAiAnalyseHardWareAlarmTypeCount(@RequestBody Map<String, Object> map) {
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 6e4ded0c2..bd3426159 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
@@ -199,14 +199,14 @@
         INNER JOIN company b ON cp.parent_id = b.company_id
         Left JOIN company f ON b.parent_id = f.company_id
         where 1 = 1
-        <if test="param.notType == '1'.toString() or param.timeUnit == '2'.toString()">
+        <if test="param.timeUnit == 'today'.toString()">
             and w1.create_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
         </if>
-        <if test="param.timeUnit == '1'.toString()">
+        <if test="param.timeUnit == 'yesterday'.toString()">
             and w1.create_time &gt;= CONCAT(DATE_FORMAT(DATE_SUB(now(), interval 1 day), '%Y-%m-%d'), ' 00:00:00')
             and w1.create_time &lt;= CONCAT(DATE_FORMAT(DATE_SUB(now(), interval 1 day), '%Y-%m-%d'), ' 23:59:59')
         </if>
-        <if test="param.timeUnit == '3'.toString()">
+        <if test="param.timeUnit == 'thisMonth'.toString()">
             and w1.create_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-01'), ' 00:00:00')
         </if>
         <if test="param.companyType == '1'.toString()">
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiStatisticServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiStatisticServiceImpl.java
index 1f3ac95ea..a6a5b6e2c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiStatisticServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiStatisticServiceImpl.java
@@ -70,7 +70,7 @@ public class AiStatisticServiceImpl implements IAiStatisticService {
         List<AiAnalyseHardWareAlarmRecordVo> rsList = new ArrayList<>();
         Integer type = MapUtils.getInteger(param, "type");
         if (type == null) {
-            param.put("notType", 1);
+            param.put("timeUnit", "today");
             //默认查今日
             rsList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
             for (AiAnalyseHardWareAlarmRecordVo record : rsList) {
@@ -78,11 +78,11 @@ public class AiStatisticServiceImpl implements IAiStatisticService {
             }
         } else if (Objects.equals(type, 1)) {
             List<AiAnalyseHardWareAlarmRecordVo> historyList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
-            map.put("timeUnit", 1);
+            map.put("timeUnit", "yesterday");
             List<AiAnalyseHardWareAlarmRecordVo> yesterdayList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
-            map.put("timeUnit", 2);
+            map.put("timeUnit", "today");
             List<AiAnalyseHardWareAlarmRecordVo> todayList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
-            map.put("timeUnit", 3);
+            map.put("timeUnit", "thisMonth");
             List<AiAnalyseHardWareAlarmRecordVo> monthList = aiAnalyseHardWareAlarmRecordMapper.selectAiAnalyseHardWareAlarmTypeCount(map);
             Map<Integer, AiAnalyseHardWareAlarmRecordVo> todayMap = todayList.stream().collect(Collectors.toMap(AiAnalyseHardWareAlarmRecordVo::getAlarmType, Function.identity(), (aiAnalyseHardWareAlarmRecord, aiAnalyseHardWareAlarmRecord2) -> aiAnalyseHardWareAlarmRecord));
             Map<Integer, AiAnalyseHardWareAlarmRecordVo> yesterdayMap = yesterdayList.stream().collect(Collectors.toMap(AiAnalyseHardWareAlarmRecordVo::getAlarmType, Function.identity(), (aiAnalyseHardWareAlarmRecord, aiAnalyseHardWareAlarmRecord2) -> aiAnalyseHardWareAlarmRecord));