From 0bbdb51ea4713c9c8ff3a09159baba92487cb8cb Mon Sep 17 00:00:00 2001
From: zhulongchuan <1624729110@qq.com>
Date: Wed, 17 Sep 2025 19:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E5=BA=93?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uav/equ/service/impl/EquModelServiceImpl.java    | 12 +++++++-----
 .../equ/service/impl/MetasploitableServiceImpl.java  |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquModelServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquModelServiceImpl.java
index 98b3665..4805492 100644
--- a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquModelServiceImpl.java
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquModelServiceImpl.java
@@ -68,21 +68,23 @@ public class EquModelServiceImpl implements IEquModelService
     public EquModel selectEquModelByModelId(Long modelId)
     {
         EquModel equModel = equModelMapper.selectEquModelByModelId(modelId);
-        if (equModel != null) {
-            SysFile dynModelFile = remoteSystemFileService.getFileInfo(equModel.getDynModelFile()).getData();
+        if (equModel != null && equModel.getDynModelFile() != null) {
+//            SysFile dynModelFile = remoteSystemFileService.getFileInfo(equModel.getDynModelFile()).getData();
+            SysFile dynModelFile = sysFileMapper.getFileInfo(equModel.getDynModelFile()).getData();
             if (dynModelFile != null) {
                 equModel.setDynModelFilePath(baseUrl + "/" + dynModelFile.getBucketName() + dynModelFile.getFilePath());
                 equModel.setDynModelFileName(dynModelFile.getFileName());
             }
 
-
-            SysFile staModelFile = remoteSystemFileService.getFileInfo(equModel.getStaModelFile()).getData();
+//            SysFile staModelFile = remoteSystemFileService.getFileInfo(equModel.getStaModelFile()).getData();
+            SysFile staModelFile = sysFileMapper.getFileInfo(equModel.getStaModelFile()).getData();
             if (staModelFile != null) {
                 equModel.setStaModelFilePath(baseUrl + "/" + staModelFile.getBucketName() + staModelFile.getFilePath());
                 equModel.setStaModelFileName(staModelFile.getFileName());
             }
 
-            SysFile iconFile = remoteSystemFileService.getFileInfo(equModel.getIconFile()).getData();
+//            SysFile iconFile = remoteSystemFileService.getFileInfo(equModel.getIconFile()).getData();
+            SysFile iconFile = sysFileMapper.getFileInfo(equModel.getIconFile()).getData();
             if (iconFile != null) {
                 equModel.setIconFilePath(baseUrl + "/" + iconFile.getBucketName() + iconFile.getFilePath());
                 equModel.setIconFileName(iconFile.getFileName());
diff --git a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/MetasploitableServiceImpl.java b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/MetasploitableServiceImpl.java
index 5ab057c..48b991d 100644
--- a/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/MetasploitableServiceImpl.java
+++ b/djhk-system/src/main/java/com/djhk/uav/equ/service/impl/MetasploitableServiceImpl.java
@@ -67,8 +67,9 @@ public class MetasploitableServiceImpl implements IMetasploitableService
     public Metasploitable selectMetasploitableById(Long id)
     {
         Metasploitable metasploitable = metasploitableMapper.selectMetasploitableById(id);
-        if (metasploitable != null) {
-            SysFile iconFile = remoteSystemFileService.getFileInfo(metasploitable.getPhoto()).getData();
+        if (metasploitable != null && metasploitable.getPhoto() != null) {
+//            SysFile iconFile = remoteSystemFileService.getFileInfo(metasploitable.getPhoto()).getData();
+            SysFile iconFile = sysFileMapper.getFileInfo(metasploitable.getPhoto()).getData();
             if (iconFile != null) {
                 metasploitable.setPhotoFilePath(baseUrl + "/" + iconFile.getBucketName() + iconFile.getFilePath());
                 metasploitable.setPhotoFileName(iconFile.getFileName());