From fab79290c153520d1b10fbf33464e2c98d21661f Mon Sep 17 00:00:00 2001
From: zhouyl <583641232@qq.com>
Date: Tue, 8 Oct 2024 16:14:41 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B5=8B=E8=AF=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/TestReportController.java          | 27 +++++++++----------
 .../functional/domain/TestReport.java         |  2 +-
 2 files changed, 13 insertions(+), 16 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 a853259..ed1f002 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
@@ -50,7 +50,7 @@ public class TestReportController {
 
 
     /**
-     * 分页查询
+     * 测试数据-分页查询
      * @param
      * @param
      * @return
@@ -116,35 +116,33 @@ public class TestReportController {
         return dataInfo;
     }
 
-//    /**
-//     * 上传测试报告文件
-//     *
-//     */
+    /**
+     * 后台管理-上传测试报告文件
+     *
+     */
     @Log(title = "测试报告管理", businessType = BusinessType.INSERT)
     @PostMapping(value = "/uploadReport", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R upload( @RequestPart("file") MultipartFile file,
-                                @RequestPart("reportName") String reportName) {
+                                @RequestPart("id") Long id) {
 
-        if (StrUtil.isEmpty(reportName)) {
-            return R.fail("报告名称不能为空！");
+        if (id == null) {
+            return R.fail("测试报告id不能为空！");
         }
 
-//        testReportService.check(reportName);
         TestReport testReport = new TestReport();
-        testReport.setReportName(reportName);
+        testReport.setId(id);
         if(file != null ){
             SysOssVo toolVo = iSysOssService.upload(file,true);
             testReport.setReportPath(toolVo.getOriginalName());
             testReport.setReportOssId(toolVo.getOssId());
         }
-        testReport.setUpdateType("报告");
         testReportService.save(testReport);
         return R.ok("操作成功！");
     }
 
 
     /**
-     * 上传测试数据
+     * 前端用户-上传测试数据
      *
      */
     @SneakyThrows
@@ -165,7 +163,7 @@ public class TestReportController {
             testReport.setReportPath(toolVo.getOriginalName());
             testReport.setReportOssId(toolVo.getOssId());
         }
-        testReport.setUpdateType("测试数据");
+
         testReportService.save(testReport);
         return R.ok("操作成功！");
     }
@@ -190,11 +188,10 @@ public class TestReportController {
 
 
     /**
-     * 下载测试数据
+     * 前端用户-下载测试数据/后端下载测试结果
      *
      * @param ossId OSS对象ID
      */
-    @SaCheckPermission("system:oss:download")
     @GetMapping("/downloadTestData/{ossId}")
     public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
 
diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/domain/TestReport.java b/tp-functional/src/main/java/com/inscloudtech/functional/domain/TestReport.java
index c03034b..7ad0246 100644
--- a/tp-functional/src/main/java/com/inscloudtech/functional/domain/TestReport.java
+++ b/tp-functional/src/main/java/com/inscloudtech/functional/domain/TestReport.java
@@ -31,7 +31,7 @@ public class TestReport extends BaseEntity {
     @TableField(condition = SqlCondition.LIKE)
     private String reportName;
     /**
-     * 报告文件
+     * 测试数据文件
      */
     private String reportPath;
     /**