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

退火设备的样品信息列表、偏置条件列表、退火设备列表，后台都不加工，使用前端传过来的json字符串

Browse Source
This commit is contained in:
dengchun
2025-05-02 09:15:24 +08:00
parent 6b6aa46551
commit fe24ec3a11
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,8 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
@Override @Override
public void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess, String type) { public void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess, String type) {
// 保存样品信息 // 保存样品信息
// 20250502 - 邓春: 不修改前端 传过来的样品信息列表
/*
List<ExperimentSampleInfo> sampleInfoList = experimentAnnealProcess.getSampleInfoList(); List<ExperimentSampleInfo> sampleInfoList = experimentAnnealProcess.getSampleInfoList();
List<String> sampleInfoIds = new ArrayList<>(); List<String> sampleInfoIds = new ArrayList<>();
if (CollUtil.isNotEmpty(sampleInfoList)) { if (CollUtil.isNotEmpty(sampleInfoList)) {
@@ -92,9 +94,11 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
} }
} }
experimentAnnealProcess.setSampleInfo(StringUtils.join(sampleInfoIds, ",")); experimentAnnealProcess.setSampleInfo(StringUtils.join(sampleInfoIds, ","));
*/
// 保存偏置条件信息 // 保存偏置条件信息
String deviationCondition = experimentAnnealProcess.getDeviationCondition(); // 20250502 - 邓春: 不修改前端 传过来的退火设备大字段
/* String deviationCondition = experimentAnnealProcess.getDeviationCondition();
if (StringUtils.isNotBlank(deviationCondition)) { if (StringUtils.isNotBlank(deviationCondition)) {
List<ExperimentDeviationCondition> deviationConditionList = JSON.parseArray(deviationCondition, List<ExperimentDeviationCondition> deviationConditionList = JSON.parseArray(deviationCondition,
ExperimentDeviationCondition.class); ExperimentDeviationCondition.class);
@@ -106,10 +110,11 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
experimentDeviationConditionService.saveOrUpdate(sampleInfo); experimentDeviationConditionService.saveOrUpdate(sampleInfo);
} }
experimentAnnealProcess.setDeviationCondition(JSON.toJSONString(deviationConditionList)); experimentAnnealProcess.setDeviationCondition(JSON.toJSONString(deviationConditionList));
} }*/
//加偏设备信息 //加偏设备信息
String deviationEquipment = experimentAnnealProcess.getDeviationEquipment(); //20250502 - 邓春:不修改前端 传过来的退火设备大字段
/* String deviationEquipment = experimentAnnealProcess.getDeviationEquipment();
if (StringUtils.isNotBlank(deviationEquipment)) { if (StringUtils.isNotBlank(deviationEquipment)) {
List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment, List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment,
ExperimentDeviationEquipment.class); ExperimentDeviationEquipment.class);
@@ -121,7 +126,7 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
experimentDeviationEquipmentService.saveOrUpdate(sampleInfo); experimentDeviationEquipmentService.saveOrUpdate(sampleInfo);
} }
experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList)); experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList));
} }*/
saveOrUpdate(experimentAnnealProcess); saveOrUpdate(experimentAnnealProcess);
} }