physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

加偏设备与样品型号需要保持一致

Browse Source
This commit is contained in:
dengchun
2025-04-27 23:33:17 +08:00
parent 81c1c406ec
commit 62e27305b7
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db/physical-boot.sql
View File

@@ -9,7 +9,6 @@ CREATE TABLE `component_search` (
`content` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '搜索内容', `content` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '搜索内容',
`extent_info` varchar(648) 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), INDEX idx_combined (data_type, content),
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

11
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -146,15 +146,20 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList(); List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList(); List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList(); List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
Set<String> sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); 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> boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
Set<String> conditionList = deviationConditionList.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)) { if (!sampleList.equals(boardList)) {
return Result.error("辐照板信息不匹配！"); return Result.error("辐照板信息不匹配！");
} }
if (!sampleList.equals(conditionList)) { if (!sampleList.equals(conditionList)) {
return Result.error("偏置条件信息不匹配！"); return Result.error("偏置条件信息不匹配！");
} }
if (!sampleList.equals(equipmentList)) {
return Result.error("加偏设备信息不匹配！");
}
experiment.setStatus(ExperimentStatus.PRE_TEST); experiment.setStatus(ExperimentStatus.PRE_TEST);
experimentService.saveWithDetail(experiment); experimentService.saveWithDetail(experiment);
@@ -225,9 +230,11 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList(); List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList(); List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList(); List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
Set<String> sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet()); 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> boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
Set<String> conditionList = deviationConditionList.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)) { if (!sampleList.equals(boardList)) {
return Result.error("辐照板信息不匹配！"); return Result.error("辐照板信息不匹配！");
} }
@@ -235,6 +242,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
return Result.error("偏置条件信息不匹配！"); return Result.error("偏置条件信息不匹配！");
} }
if (!sampleList.equals(equipmentList)) {
return Result.error("加偏设备信息不匹配！");
}
experimentService.saveWithDetail(experiment); experimentService.saveWithDetail(experiment);
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experiment.getId()); experimentLog.setExperimentId(experiment.getId());