From 2f97b5e3db5fb19c5985b227d71d4e0c73a0b6b5 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Sat, 1 Jun 2024 20:02:23 +0800
Subject: [PATCH] =?UTF-8?q?AI=E9=A2=84=E8=AD=A6=E4=BF=AE=E6=94=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AiAnalyseHardWareAlarmRecordServiceImpl.java      | 7 +++++--
 src/main/java/com/zhgd/xmgl/util/PathUtil.java             | 4 +++-
 2 files changed, 8 insertions(+), 3 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 67a221fc1..0090d83ca 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
@@ -600,8 +600,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
         record.setIsPushed(true);
         ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(record.getProjectSn());
         String relativePath = projectInfoBySn.getProjectName() + "/AI预警列表/" + DateUtil.today();
-        FileUtil.copy(PathUtil.getBasePath() + "/" + record.getImageUrl(), PathUtil.getBasePath() + "/" + relativePath, false);
-        FileUtil.copy(PathUtil.getBasePath() + "/" + record.getAlarmVideo(), PathUtil.getBasePath() + "/" + relativePath, false);
+        String dir = PathUtil.getBasePath() + "/" + relativePath;
+        FileUtil.copy(PathUtil.getBasePath() + "/" + record.getImageUrl(),  dir + "/" + FileUtil.getName(record.getImageUrl()), true);
+        FileUtil.copy(PathUtil.getBasePath() + "/" + record.getAlarmVideo(), dir + "/" + FileUtil.getName(record.getAlarmVideo()), true);
         baseMapper.updateById(record);
 
         UserInfo user = SecurityUtils.getUser();
@@ -620,6 +621,8 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
             throw new OpenAlertException("未找到该记录");
         }
         baseMapper.deleteById(id);
+        FileUtil.del(PathUtil.getBasePath() + "/" + record.getImageUrl());
+        FileUtil.del(PathUtil.getBasePath() + "/" + record.getAlarmVideo());
     }
 
     @Override
diff --git a/src/main/java/com/zhgd/xmgl/util/PathUtil.java b/src/main/java/com/zhgd/xmgl/util/PathUtil.java
index 5793cc3de..cd774d541 100644
--- a/src/main/java/com/zhgd/xmgl/util/PathUtil.java
+++ b/src/main/java/com/zhgd/xmgl/util/PathUtil.java
@@ -2,7 +2,9 @@ package com.zhgd.xmgl.util;
 
 import cn.hutool.core.util.StrUtil;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
+@Component
 public class PathUtil {
 
     private static String basePath;
@@ -31,6 +33,6 @@ public class PathUtil {
 
     @Value("${basePath}")
     public void setBasePath(String basePath) {
-        basePath = basePath;
+        PathUtil.basePath = basePath;
     }
 }