From ee3a04af2f14875a43110c510535238ccc98a2f3 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Wed, 10 Jan 2024 15:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E8=87=AA?=
 =?UTF-8?q?=E5=BB=BA=E5=8F=B0=E7=AB=99=E7=BC=93=E5=AD=98=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/common/util/SelfStationUtil.java    |  4 ----
 .../controller/SelfStationController.java     |  5 ++++
 .../modules/service/ISelfStationService.java  |  2 ++
 .../service/impl/SelfStationServiceImpl.java  | 23 +++++++++++++++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
index 69b17c32..f01270a1 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
@@ -257,10 +257,6 @@ public class SelfStationUtil extends AbstractLogOrReport {
             }
         } catch (Exception e) {
             e.printStackTrace();
-        } finally {
-            if (Objects.nonNull(file)) {
-                file.delete();
-            }
         }
         return struct;
     }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
index 9c82a0dd..6200c5d6 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
@@ -26,6 +26,11 @@ public class SelfStationController {
         return selfStationService.loadSelfStationByFile(sampleFileName, detFileName, request);
     }
 
+    @DeleteMapping("deleteSelfStationCache")
+    public void deleteSelfStationCache(String sampleFileName, HttpServletRequest request) {
+        selfStationService.deleteSelfStationCache(sampleFileName, request);
+    }
+
     @PostMapping("updateROI")
     @ApiOperation(value = "更新ROI范围", notes = "更新ROI范围")
     public Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request) {
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
index 5571554c..22c127f3 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
@@ -12,6 +12,8 @@ public interface ISelfStationService {
 
     Result loadSelfStationByFile(String sampleFileName, String detFileName, HttpServletRequest request);
 
+    void deleteSelfStationCache(String sampleFileName, HttpServletRequest request);
+
     Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request);
 
     Result energyCalibration(String fileName, String currentText, Double width, HttpServletRequest request);
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index fe000bbd..a68e5f89 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -85,6 +86,28 @@ public class SelfStationServiceImpl implements ISelfStationService {
         return result;
     }
 
+    @Override
+    public void deleteSelfStationCache(String sampleFileName, HttpServletRequest request) {
+        String userName = JwtUtil.getUserNameByToken(request);
+        String key = sampleFileName + StrUtil.DASHED + userName;
+        Cache<String, SelfStationData> selfCache = selfStationCache.getSelfCache();
+        SelfStationData selfStationData = selfCache.getIfPresent(key);
+        if (StringUtils.isNotBlank(selfStationData.getSampleTmpPath())) {
+            File file = new File(selfStationData.getSampleTmpPath());
+            if (Objects.nonNull(file)) {
+                file.delete();
+            }
+        }
+        if (StringUtils.isNotBlank(selfStationData.getDetTmpPath())) {
+            File file = new File(selfStationData.getDetTmpPath());
+            if (Objects.nonNull(file)) {
+                file.delete();
+            }
+        }
+        // 删除指定key的Cache
+        selfStationCache.deleteSelfCache(key);
+    }
+
     @Override
     public Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request) {
         Result result = new Result();