zhulongchuan/cquav
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据模型库初始化完成

Browse Source
This commit is contained in:
zhulongchuan 2025-09-17 19:52:11 +08:00
parent 52364c7265
commit 0bbdb51ea4
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
djhk-system/src/main/java/com/djhk/uav/equ/service/impl/EquModelServiceImpl.java
View File

@ -68,21 +68,23 @@ public class EquModelServiceImpl implements IEquModelService
public EquModel selectEquModelByModelId(Long modelId) public EquModel selectEquModelByModelId(Long modelId)
{ {
EquModel equModel = equModelMapper.selectEquModelByModelId(modelId); EquModel equModel = equModelMapper.selectEquModelByModelId(modelId);
if (equModel != null) { if (equModel != null && equModel.getDynModelFile() != null) {
SysFile dynModelFile = remoteSystemFileService.getFileInfo(equModel.getDynModelFile()).getData(); // SysFile dynModelFile = remoteSystemFileService.getFileInfo(equModel.getDynModelFile()).getData();
SysFile dynModelFile = sysFileMapper.getFileInfo(equModel.getDynModelFile()).getData();
if (dynModelFile != null) { if (dynModelFile != null) {
equModel.setDynModelFilePath(baseUrl + "/" + dynModelFile.getBucketName() + dynModelFile.getFilePath()); equModel.setDynModelFilePath(baseUrl + "/" + dynModelFile.getBucketName() + dynModelFile.getFilePath());
equModel.setDynModelFileName(dynModelFile.getFileName()); 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) { if (staModelFile != null) {
equModel.setStaModelFilePath(baseUrl + "/" + staModelFile.getBucketName() + staModelFile.getFilePath()); equModel.setStaModelFilePath(baseUrl + "/" + staModelFile.getBucketName() + staModelFile.getFilePath());
equModel.setStaModelFileName(staModelFile.getFileName()); 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) { if (iconFile != null) {
equModel.setIconFilePath(baseUrl + "/" + iconFile.getBucketName() + iconFile.getFilePath()); equModel.setIconFilePath(baseUrl + "/" + iconFile.getBucketName() + iconFile.getFilePath());
equModel.setIconFileName(iconFile.getFileName()); equModel.setIconFileName(iconFile.getFileName());

5
djhk-system/src/main/java/com/djhk/uav/equ/service/impl/MetasploitableServiceImpl.java
View File

@ -67,8 +67,9 @@ public class MetasploitableServiceImpl implements IMetasploitableService
public Metasploitable selectMetasploitableById(Long id) public Metasploitable selectMetasploitableById(Long id)
{ {
Metasploitable metasploitable = metasploitableMapper.selectMetasploitableById(id); Metasploitable metasploitable = metasploitableMapper.selectMetasploitableById(id);
if (metasploitable != null) { if (metasploitable != null && metasploitable.getPhoto() != null) {
SysFile iconFile = remoteSystemFileService.getFileInfo(metasploitable.getPhoto()).getData(); // SysFile iconFile = remoteSystemFileService.getFileInfo(metasploitable.getPhoto()).getData();
SysFile iconFile = sysFileMapper.getFileInfo(metasploitable.getPhoto()).getData();
if (iconFile != null) { if (iconFile != null) {
metasploitable.setPhotoFilePath(baseUrl + "/" + iconFile.getBucketName() + iconFile.getFilePath()); metasploitable.setPhotoFilePath(baseUrl + "/" + iconFile.getBucketName() + iconFile.getFilePath());
metasploitable.setPhotoFileName(iconFile.getFileName()); metasploitable.setPhotoFileName(iconFile.getFileName());