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 sampleInfoList = experiment.getSampleInfoList(); List irradiationBoardList = experiment.getIrradiationBoardList(); List deviationConditionList = experiment.getDeviationConditionList(); + List deviationEquipmentList = experiment.getDeviationEquipmentList(); Set sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); Set boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); Set conditionList = deviationConditionList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); + Set 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 sampleInfoList = experiment.getSampleInfoList(); List irradiationBoardList = experiment.getIrradiationBoardList(); List deviationConditionList = experiment.getDeviationConditionList(); + List deviationEquipmentList = experiment.getDeviationEquipmentList(); Set sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); Set boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); Set conditionList = deviationConditionList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); + Set 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