From 220b69a0dc544193b15527893034a022a1a6d305 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 30 Apr 2024 10:13:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...iAnalyseHardWareAlarmRecordServiceImpl.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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 60dd4337f..b69904dd5 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
@@ -173,21 +173,21 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         }
         AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord = new AiAnalyseHardWareAlarmRecord();
         aiAnalyseHardWareAlarmRecord.setCreateTime(body.getString("alarmTime"));
-        aiAnalyseHardWareAlarmRecord.setAlarmType(Integer.parseInt(body.getString("eventId")));
         aiAnalyseHardWareAlarmRecord.setHardwareId(aiAnalyseHardWareRecord.getHardwareId());
         aiAnalyseHardWareAlarmRecord.setHardwareName(aiAnalyseHardWareRecord.getHardwareName());
         String alarmVideo = body.getString("alarmVideo");
-        alarmVideo = alarmVideo.split(":")[2];
-        alarmVideo = alarmVideo.substring(alarmVideo.indexOf("/"));
-        FileInfo alarmVideoInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmVideo)).setPath(DateUtil.today()).upload();
-        aiAnalyseHardWareAlarmRecord.setAlarmVideo(DateUtil.today() + "/" + alarmVideoInfo.getUrl());
+        if (StringUtils.isNotEmpty(alarmVideo)) {
+            FileInfo alarmVideoInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(alarmVideo)).setPath(DateUtil.today()).upload();
+            aiAnalyseHardWareAlarmRecord.setAlarmVideo(DateUtil.today() + "/" + alarmVideoInfo.getUrl());
+        }
         aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn());
         aiAnalyseHardWareAlarmRecord.setStatus(1);
         String alarmImage = body.getString("alarmImage");
-        alarmImage = alarmImage.split(":")[2];
-        alarmImage = alarmImage.substring(alarmImage.indexOf("/"));
-        FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(serverUrl + alarmImage)).setPath(DateUtil.today()).upload();
-        aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl());
+        if (StringUtils.isNotEmpty(alarmImage)) {
+            FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(alarmImage)).setPath(DateUtil.today()).upload();
+            aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl());
+        }
+
         aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc"));
         List<DictionaryItem> dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, aiAnalyseHardWareRecord.getProjectSn());
         for (DictionaryItem dictionaryItem : dictList) {

From fa00ee8cdc7110398959f8e142bf3a0cd77aed77 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 30 Apr 2024 14:16:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b69904dd5..13d6ef847 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
@@ -178,14 +178,14 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         String alarmVideo = body.getString("alarmVideo");
         if (StringUtils.isNotEmpty(alarmVideo)) {
             FileInfo alarmVideoInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(alarmVideo)).setPath(DateUtil.today()).upload();
-            aiAnalyseHardWareAlarmRecord.setAlarmVideo(DateUtil.today() + "/" + alarmVideoInfo.getUrl());
+            aiAnalyseHardWareAlarmRecord.setAlarmVideo(DateUtil.today() + "/" + alarmVideoInfo.getFilename());
         }
         aiAnalyseHardWareAlarmRecord.setProjectSn(aiAnalyseHardWareRecord.getProjectSn());
         aiAnalyseHardWareAlarmRecord.setStatus(1);
         String alarmImage = body.getString("alarmImage");
         if (StringUtils.isNotEmpty(alarmImage)) {
             FileInfo alarmImageInfo = fileStorageService.of(UrlUtil.uploadImgUrlToMultipartFile(alarmImage)).setPath(DateUtil.today()).upload();
-            aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getUrl());
+            aiAnalyseHardWareAlarmRecord.setImageUrl(DateUtil.today() + "/" + alarmImageInfo.getFilename());
         }
 
         aiAnalyseHardWareAlarmRecord.setAlarmDesc(body.getString("alarmDesc"));