From c534b691f2875defb2e9d3c8ced9e7d5ed859a46 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sat, 27 Apr 2024 18:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/video/entity/AiAnalyseHardWareAlarmRecord.java | 6 ------
 .../impl/AiAnalyseHardWareAlarmRecordServiceImpl.java      | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java
index b5587d486..261f8d9cf 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/AiAnalyseHardWareAlarmRecord.java
@@ -78,12 +78,6 @@ public class AiAnalyseHardWareAlarmRecord implements Serializable {
     @Excel(name = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测", width = 15)
     @ApiModelProperty(value = "类型 1-烟感报警，2-明火报警，3-人员到底报警，4-未带安全帽报警，5-区域入侵报警，6-越界入侵报警，7-人员聚集报警， 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测")
     private java.lang.Integer alarmType;
-    /**
-     * 告警类型
-     */
-    @Excel(name = "告警类型", width = 15)
-    @ApiModelProperty(value = "告警类型")
-    private java.lang.String alarmName;
     /**
      * 位置
      */
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 cc61bf7fe..6ca689557 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
@@ -189,7 +189,12 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmImage)).setPath(DateUtil.today()).upload();
         aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl());
         aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc"));
-        aiAnalyseHardWareAlarmRecord.setAlarmName(body.getString("alarmType"));
+        List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, aiAnalyseHardWareRecord.getProjectSn());
+        for (DictionaryItem dictionaryItem : dictList) {
+            if (dictionaryItem.getName().equals(body.getString("alarmType"))) {
+                aiAnalyseHardWareAlarmRecord.setAlarmType(Integer.parseInt(dictionaryItem.getData()));
+            }
+        }
         aiAnalyseHardWareAlarmRecordMapper.insert(aiAnalyseHardWareAlarmRecord);
         //将数据通过MQTT转发到前台
         asyncAiAnalyse.sendAiAnalyse(aiAnalyseHardWareAlarmRecord);