From 62e27305b775deb8f117a06494126cae81c6798e Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sun, 27 Apr 2025 23:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=81=8F=E8=AE=BE=E5=A4=87=E4=B8=8E?=
 =?UTF-8?q?=E6=A0=B7=E5=93=81=E5=9E=8B=E5=8F=B7=E9=9C=80=E8=A6=81=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/physical-boot.sql                                  |  1 -
 .../database/controller/ExperimentController.java     | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/db/physical-boot.sql b/db/physical-boot.sql
index eb968a4..230a44a 100644
--- a/db/physical-boot.sql
+++ b/db/physical-boot.sql
@@ -9,7 +9,6 @@ CREATE TABLE `component_search` (
   `content` varchar(200) CHARACTER SET utf8mb4  DEFAULT NULL COMMENT '搜索内容',
   `extent_info` varchar(648) CHARACTER SET utf8mb4  DEFAULT NULL COMMENT '拓展字段',
   -- 索引
-    UNIQUE INDEX idx_unique_column2 (content),
     INDEX idx_combined (data_type, content),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
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 2d3fc52..3f8d8f3 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
@@ -146,15 +146,20 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
         List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
         List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
+        List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
         Set<String> sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
         Set<String> boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
         Set<String> conditionList = deviationConditionList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
+        Set<String> equipmentList = deviationEquipmentList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
         if (!sampleList.equals(boardList)) {
             return Result.error("辐照板信息不匹配！");
         }
         if (!sampleList.equals(conditionList)) {
             return Result.error("偏置条件信息不匹配！");
         }
+        if (!sampleList.equals(equipmentList)) {
+            return Result.error("加偏设备信息不匹配！");
+        }
         experiment.setStatus(ExperimentStatus.PRE_TEST);
         experimentService.saveWithDetail(experiment);
 
@@ -225,9 +230,11 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
         List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
         List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
+        List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
         Set<String> sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
         Set<String> boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
         Set<String> conditionList = deviationConditionList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
+        Set<String> equipmentList = deviationEquipmentList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
         if (!sampleList.equals(boardList)) {
             return Result.error("辐照板信息不匹配！");
         }
@@ -235,6 +242,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
             return Result.error("偏置条件信息不匹配！");
         }
 
+        if (!sampleList.equals(equipmentList)) {
+            return Result.error("加偏设备信息不匹配！");
+        }
+
         experimentService.saveWithDetail(experiment);
         ExperimentLog experimentLog = new ExperimentLog();
         experimentLog.setExperimentId(experiment.getId());