From 7d6b3140f8a3e34eb084a5f68a6f10b4c8b542df Mon Sep 17 00:00:00 2001
From: zhouyl <583641232@qq.com>
Date: Mon, 9 Sep 2024 17:29:43 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/system/TestReportController.java   |  2 +-
 .../web/controller/system/ToolManageController.java   | 11 -----------
 .../common/utils/file/FileUploadUtils.java            |  2 +-
 .../system/service/impl/ToolManageServiceImpl.java    |  6 +-----
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java
index 750c0d3..16529ab 100644
--- a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java
+++ b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/TestReportController.java
@@ -110,7 +110,7 @@ public class TestReportController {
     @SneakyThrows
     @Log(title = "测试数据管理", businessType = BusinessType.INSERT)
     @PostMapping(value = "/uploadTestData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R uploadToolAndTips( @RequestPart("file") MultipartFile file,
+    public R uploadTestData( @RequestPart("file") MultipartFile file,
                                 @RequestPart("reportName") String reportName) {
 
         if (StrUtil.isEmpty(reportName)) {
diff --git a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/ToolManageController.java b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/ToolManageController.java
index 320b158..89d6618 100644
--- a/tp-admin/src/main/java/com/inscloudtech/web/controller/system/ToolManageController.java
+++ b/tp-admin/src/main/java/com/inscloudtech/web/controller/system/ToolManageController.java
@@ -122,17 +122,6 @@ public class ToolManageController extends BaseController {
         iToolManageService.downloadByToolName(downloadToolRequest,response);
     }
 
-
-//    /**
-//     * 修改测试包管理
-//     */
-//    @Log(title = "测试包管理", businessType = BusinessType.UPDATE)
-//    @RepeatSubmit()
-//    @PutMapping()
-//    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ToolManage bo) {
-//        return toAjax(iToolManageService.updateByBo(bo));
-//    }
-
     /**
      * 删除测试包管理
      *
diff --git a/tp-common/src/main/java/com/inscloudtech/common/utils/file/FileUploadUtils.java b/tp-common/src/main/java/com/inscloudtech/common/utils/file/FileUploadUtils.java
index 2f75d9b..109132c 100644
--- a/tp-common/src/main/java/com/inscloudtech/common/utils/file/FileUploadUtils.java
+++ b/tp-common/src/main/java/com/inscloudtech/common/utils/file/FileUploadUtils.java
@@ -204,7 +204,7 @@ public class FileUploadUtils {
     public static String getPathFileName(String uploadDir, String fileName) throws IOException {
         int dirLastIndex = ProjectConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
-        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+        return Constants.RESOURCE_PREFIX + "/" + currentDir + fileName;
     }
 
     /**
diff --git a/tp-system/src/main/java/com/inscloudtech/system/service/impl/ToolManageServiceImpl.java b/tp-system/src/main/java/com/inscloudtech/system/service/impl/ToolManageServiceImpl.java
index e52e0ec..2e6aa2e 100644
--- a/tp-system/src/main/java/com/inscloudtech/system/service/impl/ToolManageServiceImpl.java
+++ b/tp-system/src/main/java/com/inscloudtech/system/service/impl/ToolManageServiceImpl.java
@@ -188,11 +188,7 @@ public class ToolManageServiceImpl implements IToolManageService {
         ToolManage dbObj = baseMapper.selectOne(new LambdaQueryWrapper<ToolManage>().eq(ToolManage::getToolName, request.getToolName())
             .eq(ToolManage::getModuleName, request.getModuleName()));
         if (ObjectUtil.isNull(dbObj)) {
-            throw new ServiceException("测试包信息不存在!");
-        }
-
-        if(dbObj.getToolOssId() == null || dbObj.getToolOssId() == 0L){
-            throw new ServiceException("文件数据不存在!");
+            throw new ServiceException("测试工具信息不存在!");
         }
 
         if(request.getType() == 0){