diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportPrjService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportPrjService.java index 86b82d1..1ae77f8 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportPrjService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/ImportPrjService.java @@ -4,7 +4,6 @@ import cn.hutool.core.lang.tree.Tree; 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.ImportFileInfoVO; -import com.electromagnetic.industry.software.manage.pojo.resp.ImportPrjTreeVO; import jakarta.servlet.http.HttpServletResponse; import org.springframework.core.io.InputStreamResource; import org.springframework.http.ResponseEntity; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportPrjServiceImpl.java index cc02a40..05e9f30 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ImportPrjServiceImpl.java @@ -11,7 +11,6 @@ import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.text.StrFormatter; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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 jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; import org.mockito.internal.util.io.IOUtil; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; @@ -52,6 +52,7 @@ import java.util.zip.ZipFile; import static com.electromagnetic.industry.software.common.cons.ElectromagneticConstants.*; +@Slf4j @Service public class ImportPrjServiceImpl extends ServiceImpl implements ImportPrjService { @@ -146,7 +147,7 @@ public class ImportPrjServiceImpl extends ServiceImpl download(String id, HttpServletResponse response) { String fileName = ""; ImportFileInfo fileInfo = this.baseMapper.selectById(id); - String fileSysPath = elePropertyConfig.getImportPrjPath() + File.pathSeparator + id; + String fileSysPath = elePropertyConfig.getImportPrjPath() + File.separator + id; String dbPath = fileInfo.getSrcPath(); try { Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在,路径为 {}", dbPath); @@ -218,6 +219,9 @@ public class ImportPrjServiceImpl extends ServiceImpl