chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调通了相关接口

This commit is contained in:
chenxudong 2025-06-19 11:09:58 +08:00
parent c9980e9fa3
commit 11ca563c93
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportPrjService.java
View File

@ -4,7 +4,6 @@ import cn.hutool.core.lang.tree.Tree;
import com.electromagnetic.industry.software.common.pojo.RespPageVO; import com.electromagnetic.industry.software.common.pojo.RespPageVO;
import com.electromagnetic.industry.software.manage.pojo.req.ImportFileDirQueryVO; import com.electromagnetic.industry.software.manage.pojo.req.ImportFileDirQueryVO;
import com.electromagnetic.industry.software.manage.pojo.req.ImportFileInfoVO; import com.electromagnetic.industry.software.manage.pojo.req.ImportFileInfoVO;
import com.electromagnetic.industry.software.manage.pojo.resp.ImportPrjTreeVO;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.InputStreamResource;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;

9
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportPrjServiceImpl.java
View File

@ -11,7 +11,6 @@ import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.text.StrFormatter; import cn.hutool.core.text.StrFormatter;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -33,6 +32,7 @@ import com.electromagnetic.industry.software.manage.pojo.resp.ImportPrjTreeVO;
import com.electromagnetic.industry.software.manage.service.ImportPrjService; import com.electromagnetic.industry.software.manage.service.ImportPrjService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.mockito.internal.util.io.IOUtil; import org.mockito.internal.util.io.IOUtil;
import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.InputStreamResource;
@ -52,6 +52,7 @@ import java.util.zip.ZipFile;
import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*;
@Slf4j
@Service @Service
public class ImportPrjServiceImpl extends ServiceImpl<ImportPrjInfoMapper, ImportFileInfo> implements ImportPrjService { public class ImportPrjServiceImpl extends ServiceImpl<ImportPrjInfoMapper, ImportFileInfo> implements ImportPrjService {
@ -146,7 +147,7 @@ public class ImportPrjServiceImpl extends ServiceImpl<ImportPrjInfoMapper, Impor
public ResponseEntity<InputStreamResource> download(String id, HttpServletResponse response) { public ResponseEntity<InputStreamResource> download(String id, HttpServletResponse response) {
String fileName = ""; String fileName = "";
ImportFileInfo fileInfo = this.baseMapper.selectById(id); ImportFileInfo fileInfo = this.baseMapper.selectById(id);
String fileSysPath = elePropertyConfig.getImportPrjPath() + File.pathSeparator + id; String fileSysPath = elePropertyConfig.getImportPrjPath() + File.separator + id;
String dbPath = fileInfo.getSrcPath(); String dbPath = fileInfo.getSrcPath();
try { try {
Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在，路径为 {}", dbPath); Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在，路径为 {}", dbPath);
@ -218,6 +219,9 @@ public class ImportPrjServiceImpl extends ServiceImpl<ImportPrjInfoMapper, Impor
.eq(ImportFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(ImportFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(ImportFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(ImportFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.likeRight(ImportFileInfo::getFilePath, prdId)); .likeRight(ImportFileInfo::getFilePath, prdId));
if (CollUtil.isEmpty(importFileInfos)) {
return null;
}
TreeNodeConfig config = new TreeNodeConfig(); TreeNodeConfig config = new TreeNodeConfig();
config.setIdKey(ImportPrjTreeVO.Fields.id); config.setIdKey(ImportPrjTreeVO.Fields.id);
config.setParentIdKey(ImportPrjTreeVO.Fields.parentId); config.setParentIdKey(ImportPrjTreeVO.Fields.parentId);
@ -236,6 +240,7 @@ public class ImportPrjServiceImpl extends ServiceImpl<ImportPrjInfoMapper, Impor
if (!StrUtil.equals(importFileInfo.getParentId(), ElectromagneticConstants.PRJ_PARENT_ID)) { if (!StrUtil.equals(importFileInfo.getParentId(), ElectromagneticConstants.PRJ_PARENT_ID)) {
return; return;
} }
importFileInfo.setFileType("zip");
String fileName = importFileInfo.getFileName(); String fileName = importFileInfo.getFileName();
for (int i = 0; i < 1000; ++i) { for (int i = 0; i < 1000; ++i) {
long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(ImportFileInfo.class) long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(ImportFileInfo.class)