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-04-11 22:25:22 +08:00
parent 5388191209
commit 71a075236c
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
View File

@@ -113,6 +113,9 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment, List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment,
ExperimentDeviationEquipment.class); ExperimentDeviationEquipment.class);
for (ExperimentDeviationEquipment sampleInfo : deviationEquipmentList) { for (ExperimentDeviationEquipment sampleInfo : deviationEquipmentList) {
if (StringUtils.equals(type, "add")) {
sampleInfo.setId(null);
}
experimentDeviationEquipmentService.saveOrUpdate(sampleInfo); experimentDeviationEquipmentService.saveOrUpdate(sampleInfo);
} }
experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList)); experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList));
@@ -123,7 +126,8 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
@Override @Override
public void copy(String oldId, String newExperimentId) { public void copy(String oldId, String newExperimentId) {
ExperimentAnnealProcess experiment = new ExperimentAnnealProcess(); ExperimentAnnealProcess experiment = new ExperimentAnnealProcess();
BeanUtil.copyProperties(getById(oldId), experiment); ExperimentAnnealProcess oldObj = getById(oldId);
BeanUtil.copyProperties(oldObj, experiment);
experiment.setId(null); experiment.setId(null);
experiment.setExperimentId(newExperimentId); experiment.setExperimentId(newExperimentId);
experiment.setAnnealStartTime(null); experiment.setAnnealStartTime(null);
@@ -135,6 +139,31 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
} else { } else {
experiment.setSampleInfo(null); experiment.setSampleInfo(null);
} }
// 保存偏置条件信息
String deviationCondition = oldObj.getDeviationCondition();
if (StringUtils.isNotBlank(deviationCondition)) {
List<ExperimentDeviationCondition> deviationConditionList = JSON.parseArray(deviationCondition,
ExperimentDeviationCondition.class);
deviationConditionList.forEach(sampleInfo -> {
sampleInfo.setId(null);
experimentDeviationConditionService.saveOrUpdate(sampleInfo);
});
experiment.setDeviationCondition(JSON.toJSONString(deviationConditionList));
}
//加偏设备信息
String deviationEquipment = oldObj.getDeviationEquipment();
if (StringUtils.isNotBlank(deviationEquipment)) {
List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment,
ExperimentDeviationEquipment.class);
deviationEquipmentList.forEach(sampleInfo -> {
sampleInfo.setId(null);
experimentDeviationEquipmentService.saveOrUpdate(sampleInfo);
});
experiment.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList));
}
save(experiment); save(experiment);
} }