From 952fc2988db6c1947c35fdfa7be48c1111f69baf Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Wed, 9 Jul 2025 16:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8Bzip?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../casic/ci/api/TestCaseManagerController.java | 5 +++-- .../testCase/TestCaseManagerDownloadResp.java | 9 +++++++++ .../converter/TargetVersionConverter.java | 1 + .../dataObject/target/TargetVersion.java | 4 ++++ .../target/impl/TargetManagerServiceImpl.java | 12 +++++++----- .../testCase/TestCaseManagerService.java | 3 ++- .../impl/TestCaseManagerServiceImpl.java | 17 ++++++++++------- 7 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java index 859b5d1b..7c2ba034 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TestCaseManagerController.java @@ -3,6 +3,7 @@ package cd.casic.ci.api; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerQueryReq; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerReq; +import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerDownloadResp; import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.dataObject.base.BaseIdReq; import cd.casic.ci.process.process.service.testCase.TestCaseManagerService; @@ -85,7 +86,7 @@ public class TestCaseManagerController { return CommonResult.success(resp); } @GetMapping("/downLoadById") - public void downLoadByManagerId(@RequestParam String managerId, HttpServletResponse response){ - testCaseManagerService.downLoadById(managerId,response); + public CommonResult downLoadByManagerId(@RequestParam String managerId){ + return CommonResult.success(testCaseManagerService.downLoadById(managerId)); } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java new file mode 100644 index 00000000..8e536cef --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/testCase/TestCaseManagerDownloadResp.java @@ -0,0 +1,9 @@ +package cd.casic.ci.process.dto.resp.testCase; + +import lombok.Data; + +@Data +public class TestCaseManagerDownloadResp { + private String fileName; + private String file; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java index c1e4a40c..0e7dc1a8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TargetVersionConverter.java @@ -29,6 +29,7 @@ public interface TargetVersionConverter { void updateReqCopyToTargetVersion(TargetVersionUpdateReq req,@MappingTarget TargetVersion targetVersion); TargetVersion targetCreateReqToTargetVersionBean(TargetManagerCreateReq req); + TargetVersionCreateReq targetCreateReqToTargetVersionCreateReq(TargetManagerCreateReq req); TargetVersion versionCreateReqToTargetVersionBean(TargetVersionCreateReq req); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java index a5939a1d..70e99cd0 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/target/TargetVersion.java @@ -46,4 +46,8 @@ public class TargetVersion extends PipBaseElement { * 文件地址路径 */ private String filePath; + /** + * 目标版本 + * */ + private String versionCompose; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java index 283df5bb..601b1dad 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java @@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import org.springframework.web.multipart.MultipartFile; @@ -77,11 +78,12 @@ public class TargetManagerServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("version",targetVersion.getVersion()); wrapper.eq("target_id",targetVersion.getTargetId()); - if (!ObjectUtils.isEmpty(targetVersionDao.selectList(wrapper))){ + if (!CollectionUtils.isEmpty(targetVersionDao.selectList(wrapper))){ throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"版本已存在"); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java index db62fa16..cb9bdaad 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/TestCaseManagerService.java @@ -3,6 +3,7 @@ package cd.casic.ci.process.process.service.testCase; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerQueryReq; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerReq; +import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerDownloadResp; import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.dataObject.testCase.TestCaseManager; import cd.casic.framework.commons.pojo.PageResult; @@ -36,6 +37,6 @@ public interface TestCaseManagerService extends IService { TestCaseManagerResp findById(String id); - void downLoadById(String id , HttpServletResponse response); + TestCaseManagerDownloadResp downLoadById(String id ); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java index 631e62dc..aea0fdf7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/testCase/impl/TestCaseManagerServiceImpl.java @@ -4,6 +4,7 @@ package cd.casic.ci.process.process.service.testCase.impl; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerQueryReq; import cd.casic.ci.process.dto.req.testCase.TestCaseManagerReq; import cd.casic.ci.process.dto.resp.testCase.TestCaseInfoResp; +import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerDownloadResp; import cd.casic.ci.process.dto.resp.testCase.TestCaseManagerResp; import cd.casic.ci.process.process.converter.TestCaseManagerConverter; import cd.casic.ci.process.process.dao.testCase.TestCaseInfoDao; @@ -25,7 +26,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jcraft.jsch.*; import jakarta.annotation.Resource; -import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; @@ -35,7 +35,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.stream.Collectors; @@ -152,11 +151,9 @@ public class TestCaseManagerServiceImpl extends ServiceImpl