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());