From 9f0c4181e40dedcf574e77a95f838fd94bb0619b Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 10 Dec 2024 14:03:44 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java         | 16 +++++++---------
 .../controller/ExperimentFileController.java     | 13 +++++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 7c23e85..fc43259 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -16,18 +16,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.util.CommonUtils;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.database.constant.ExperimentStatus;
 import org.jeecg.modules.database.entity.*;
 import org.jeecg.modules.database.service.*;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.Arrays;
@@ -44,7 +39,7 @@ import java.util.List;
 @RequestMapping("/database/experiment")
 @Slf4j
 public class ExperimentController extends JeecgController<Experiment, IExperimentService> {
- @Autowired
+    @Autowired
     private IExperimentService                 experimentService;
     @Autowired
     private IExperimentLogService              experimentLogService;
@@ -102,7 +97,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
      * @return
      */
     @AutoLog(value = "试验管理-添加")
-    @Operation(summary = "试验管理-添加")
+    @Operation(summary = "试验管理-添加",
+            description = "添加试验,传sampleInfoList,deviationConditionList,deviationEquipmentList,irradiationBoardList,不用传fileList. </br> "
+                    + "experimentUser 用,隔开")
     @RequiresPermissions("database:experiment:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody Experiment experiment, HttpServletRequest request) {
@@ -136,7 +133,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
      * @return
      */
     @AutoLog(value = "试验管理-编辑")
-    @Operation(summary = "试验管理-编辑")
+    @Operation(summary = "试验管理-编辑",
+            description = "编辑试验,传sampleInfoList,deviationConditionList,deviationEquipmentList,irradiationBoardList,不用传fileList \n "
+                    + "experimentUser 用逗号隔开,无修改的字段可不传")
     @RequiresPermissions("database:experiment:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody Experiment experiment, HttpServletRequest request) {
@@ -265,5 +264,4 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         return super.importExcel(request, response, Experiment.class);
     }
 
-
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
index e134dcc..63d2fc4 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java
@@ -177,14 +177,14 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
      * @return
      */
     //@AutoLog(value = "试验评定-通过id查询")
-    @Operation(summary = "试验报告-通过实验ID查询")
+    @Operation(summary = "试验报告-通过实验ID查询", description = "根据实验ID查询,返回List结构")
     @GetMapping(value = "/queryByExperimentId")
     public Result<List<ExperimentFile>> queryByExperimentId(@RequestParam(name = "experimentId", required = true) String experimentId) {
         List<ExperimentFile> byExperimentId = experimentFileService.getByExperimentId(experimentId);
         return Result.OK(byExperimentId);
     }
 
-    @Operation(summary = "试验报告-通过实验ID分类查询")
+    @Operation(summary = "试验报告-通过实验ID分类查询", description = "根据分类查询,返回Map结构")
     @GetMapping(value = "/queryByType")
     public Result<Map<String, List<ExperimentFile>>> queryByType(
             @RequestParam(name = "experimentId", required = true) String experimentId) {
@@ -196,13 +196,17 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
         return Result.OK(result);
     }
 
-    @Operation(summary = "试验管理-上传试验文件")
+    @Operation(summary = "试验管理-上传试验文件",
+            description =
+                    "fileType 选传, 值为 ['辐照试验委托书','试验大纲','沟通记录表','合同/委托书评审表','试验大纲评审表','试验流程检查单','辐照试验更改申请表','满意度调查表','其他文件'],不传默认 '其他文件',"
+                            + "</br> experimentId 必传,上传完成后自动保存到试验管理")
     @PostMapping(value = "/upload")
     public Result<?> upload(HttpServletRequest request, HttpServletResponse response,
+                            @RequestParam(name = "experimentId", required = true) String experimentId,
                             @RequestParam(name = "fileType", required = true) String fileType) throws Exception {
         Result<ExperimentFile> result = new Result<>();
         if (StringUtils.isBlank(fileType)) {
-            fileType = "其他";
+            fileType = ExperimentFileType.QTWJ.getType();
         }
 
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@@ -214,6 +218,7 @@ public class ExperimentFileController extends JeecgController<ExperimentFile, IE
 
         ExperimentFile ossFile = new ExperimentFile();
         ossFile.setFileName(file.getOriginalFilename());
+        ossFile.setExperimentId(experimentId);
         ossFile.setFileUrl(savePath);
         ossFile.setFileType(fileType);
         experimentFileService.save(ossFile);