From 3b2f4213a4bf751684e34a6a87ebb2f2b1f7194e Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Thu, 10 Jul 2025 11:16:39 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java      | 54 +++++++++----------
 .../ExperimentReportController.java           | 11 ++++
 2 files changed, 36 insertions(+), 29 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 b5b5880..1222a20 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
@@ -169,10 +169,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
             return Result.error("实验编号格式不正确！");
         }
         //校验试验的基本信息
-        //String result = validateSampleInfos(experiment);
-        //if (StringUtils.isNotBlank(result)) {
-        //    return Result.error(result);
-        //}
+        String result = validateSampleInfos(experiment);
+        if (StringUtils.isNotBlank(result)) {
+            return Result.error(result);
+        }
 
         experiment.setStatus(ExperimentStatus.PRE_TEST);
         experimentService.saveWithDetail(experiment);
@@ -196,45 +196,41 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
      * @return 错误信息， 如果返回为空，则校验通过。
      */
     private String validateSampleInfos(Experiment experiment) {
-        List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
-        List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
-        List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
-        List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
+        Experiment experimentDb = experimentService.getById(experiment.getId());
+        experimentService.fetchExperimentDetail(experimentDb);
+        List<ExperimentSampleInfo> sampleInfoList = experimentDb.getSampleInfoList();
+        List<ExperimentIrradiationBoard> irradiationBoardList = experimentDb.getIrradiationBoardList();
+        List<ExperimentDeviationCondition> deviationConditionList = experimentDb.getDeviationConditionList();
+        List<ExperimentDeviationEquipment> deviationEquipmentList = experimentDb.getDeviationEquipmentList();
 
-        Set<String> sampleModelSet = sampleInfoList.stream()
-                .map(ExperimentSampleInfo::getSampleModel)
+        Set<String> sampleIdSet = sampleInfoList.stream()
+                .map(ExperimentSampleInfo::getId).sorted()
                 .collect(Collectors.toSet());
 
         Set<String> irradiationBoardModels = irradiationBoardList.stream()
-                .map(ExperimentIrradiationBoard::getSampleModel)
-                .filter(sampleModel -> sampleModel != null && !sampleModel.isEmpty())
-                .flatMap(sampleModel -> Arrays.stream(sampleModel.split(",")))
-                .map(String::trim)
+                .map(ExperimentIrradiationBoard::getSampleId)
+                .map(String::trim).sorted()
                 .collect(Collectors.toSet());
 
-        if (!sampleModelSet.equals(irradiationBoardModels)) {
+        if (!sampleIdSet.equals(irradiationBoardModels)) {
             return "辐照板信息不匹配！";
         }
 
         Set<String> deviationConditionModels = deviationConditionList.stream()
-                .map(ExperimentDeviationCondition::getSampleModel)
-                .filter(sampleModel -> sampleModel != null && !sampleModel.isEmpty())
-                .flatMap(sampleModel -> Arrays.stream(sampleModel.split(",")))
-                .map(String::trim)
+                .map(ExperimentDeviationCondition::getSampleId)
+                .map(String::trim).sorted()
                 .collect(Collectors.toSet());
 
-        if (!sampleModelSet.equals(deviationConditionModels)) {
+        if (!sampleIdSet.equals(deviationConditionModels)) {
             return "偏置条件信息不匹配！";
         }
 
         Set<String> deviationEquipmentModels = deviationEquipmentList.stream()
-                .map(ExperimentDeviationEquipment::getSampleModel)
-                .filter(sampleModel -> sampleModel != null && !sampleModel.isEmpty())
-                .flatMap(sampleModel -> Arrays.stream(sampleModel.split(",")))
-                .map(String::trim)
+                .map(ExperimentDeviationEquipment::getSampleId)
+                .map(String::trim).sorted()
                 .collect(Collectors.toSet());
 
-        if (!sampleModelSet.equals(deviationEquipmentModels)) {
+        if (!sampleIdSet.equals(deviationEquipmentModels)) {
             return "加偏设备信息不匹配！";
         }
 
@@ -315,10 +311,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         }
 
         //校验试验的基本信息
-        //String result = validateSampleInfos(experiment);
-        //if (StringUtils.isNotBlank(result)) {
-        //    return Result.error(result);
-        //}
+        String result = validateSampleInfos(experiment);
+        if (StringUtils.isNotBlank(result)) {
+            return Result.error(result);
+        }
 
         experimentService.saveWithDetail(experiment);
         ExperimentLog experimentLog = new ExperimentLog();
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
index 8438bfb..74a3c04 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
@@ -160,6 +160,17 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         return Result.OK(generate);
     }
 
+    @AutoLog(value = "试验报告-更新文件")
+    @Operation(summary = "试验报告-更新文件")
+    @RequiresPermissions("database:experiment_report:edit")
+    @RequestMapping(value = "/updateFile", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> updateFile(@RequestBody ExperimentReport experimentReport, HttpServletRequest request) {
+        ExperimentReport report = experimentReportService.getById(experimentReport.getId());
+        report.setFileUrl(experimentReport.getFileUrl());
+        experimentReportService.updateById(report);
+        return Result.OK(experimentReport.getFileUrl());
+    }
+
     /**
      * 通过id删除
      *