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

update

Browse Source
This commit is contained in:
ls
2025-07-10 11:16:39 +08:00
parent 181be9c9a2
commit 3b2f4213a4
2 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,10 +169,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
return Result.error("实验编号格式不正确！"); return Result.error("实验编号格式不正确！");
} }
//校验试验的基本信息 //校验试验的基本信息
//String result = validateSampleInfos(experiment); String result = validateSampleInfos(experiment);
//if (StringUtils.isNotBlank(result)) { if (StringUtils.isNotBlank(result)) {
// return Result.error(result); return Result.error(result);
//} }
experiment.setStatus(ExperimentStatus.PRE_TEST); experiment.setStatus(ExperimentStatus.PRE_TEST);
experimentService.saveWithDetail(experiment); experimentService.saveWithDetail(experiment);
@@ -196,45 +196,41 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
* @return 错误信息， 如果返回为空，则校验通过。 * @return 错误信息， 如果返回为空，则校验通过。
*/ */
private String validateSampleInfos(Experiment experiment) { private String validateSampleInfos(Experiment experiment) {
List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList(); Experiment experimentDb = experimentService.getById(experiment.getId());
List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList(); experimentService.fetchExperimentDetail(experimentDb);
List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList(); List<ExperimentSampleInfo> sampleInfoList = experimentDb.getSampleInfoList();
List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList(); List<ExperimentIrradiationBoard> irradiationBoardList = experimentDb.getIrradiationBoardList();
List<ExperimentDeviationCondition> deviationConditionList = experimentDb.getDeviationConditionList();
List<ExperimentDeviationEquipment> deviationEquipmentList = experimentDb.getDeviationEquipmentList();
Set<String> sampleModelSet = sampleInfoList.stream() Set<String> sampleIdSet = sampleInfoList.stream()
.map(ExperimentSampleInfo::getSampleModel) .map(ExperimentSampleInfo::getId).sorted()
.collect(Collectors.toSet()); .collect(Collectors.toSet());
Set<String> irradiationBoardModels = irradiationBoardList.stream() Set<String> irradiationBoardModels = irradiationBoardList.stream()
.map(ExperimentIrradiationBoard::getSampleModel) .map(ExperimentIrradiationBoard::getSampleId)
.filter(sampleModel -> sampleModel != null && !sampleModel.isEmpty()) .map(String::trim).sorted()
.flatMap(sampleModel -> Arrays.stream(sampleModel.split(",")))
.map(String::trim)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (!sampleModelSet.equals(irradiationBoardModels)) { if (!sampleIdSet.equals(irradiationBoardModels)) {
return "辐照板信息不匹配！"; return "辐照板信息不匹配！";
} }
Set<String> deviationConditionModels = deviationConditionList.stream() Set<String> deviationConditionModels = deviationConditionList.stream()
.map(ExperimentDeviationCondition::getSampleModel) .map(ExperimentDeviationCondition::getSampleId)
.filter(sampleModel -> sampleModel != null && !sampleModel.isEmpty()) .map(String::trim).sorted()
.flatMap(sampleModel -> Arrays.stream(sampleModel.split(",")))
.map(String::trim)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (!sampleModelSet.equals(deviationConditionModels)) { if (!sampleIdSet.equals(deviationConditionModels)) {
return "偏置条件信息不匹配！"; return "偏置条件信息不匹配！";
} }
Set<String> deviationEquipmentModels = deviationEquipmentList.stream() Set<String> deviationEquipmentModels = deviationEquipmentList.stream()
.map(ExperimentDeviationEquipment::getSampleModel) .map(ExperimentDeviationEquipment::getSampleId)
.filter(sampleModel -> sampleModel != null && !sampleModel.isEmpty()) .map(String::trim).sorted()
.flatMap(sampleModel -> Arrays.stream(sampleModel.split(",")))
.map(String::trim)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
if (!sampleModelSet.equals(deviationEquipmentModels)) { if (!sampleIdSet.equals(deviationEquipmentModels)) {
return "加偏设备信息不匹配！"; return "加偏设备信息不匹配！";
} }
@@ -315,10 +311,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
} }
//校验试验的基本信息 //校验试验的基本信息
//String result = validateSampleInfos(experiment); String result = validateSampleInfos(experiment);
//if (StringUtils.isNotBlank(result)) { if (StringUtils.isNotBlank(result)) {
// return Result.error(result); return Result.error(result);
//} }
experimentService.saveWithDetail(experiment); experimentService.saveWithDetail(experiment);
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();

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

@@ -160,6 +160,17 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
return Result.OK(generate); 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删除 * 通过id删除
* *