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-07 00:51:58 +08:00
parent 46b8ff45ae
commit d7dcbed201
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,15 +270,15 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
List<ExperimentAnnealProcess> experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId()); List<ExperimentAnnealProcess> experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId());
if (CollUtil.isNotEmpty(experimentAnnealProcess)) { if (CollUtil.isNotEmpty(experimentAnnealProcess)) {
experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.copy(copied.getId())); experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.copy(old.getId(),copied.getId()));
} }
List<ExperimentRadiationProcess> experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId()); List<ExperimentRadiationProcess> experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId());
if (CollUtil.isNotEmpty(experimentRadiationProcess)) { if (CollUtil.isNotEmpty(experimentRadiationProcess)) {
experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.copy(copied.getId())); experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.copy(old.getId(),copied.getId()));
} }
List<ExperimentTestProcess> experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId()); List<ExperimentTestProcess> experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId());
if (CollUtil.isNotEmpty(experimentTestProcess)) { if (CollUtil.isNotEmpty(experimentTestProcess)) {
experimentTestProcess.forEach(v -> experimentTestProcessService.copy(copied.getId())); experimentTestProcess.forEach(v -> experimentTestProcessService.copy(old.getId(),copied.getId()));
} }
return Result.OK("复制成功!"); return Result.OK("复制成功!");
} }

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
View File

@@ -18,5 +18,5 @@ public interface IExperimentAnnealProcessService extends IService<ExperimentAnne
void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess); void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess);
void copy(String experimentId); void copy(String oldExperimentId,String newExperimentId);
} }

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
View File

@@ -18,5 +18,5 @@ public interface IExperimentRadiationProcessService extends IService<ExperimentR
void saveWithDetails(ExperimentRadiationProcess experimentRadiationProcess); void saveWithDetails(ExperimentRadiationProcess experimentRadiationProcess);
void copy(String experimentId); void copy(String oldExperimentId,String newExperimentId);
} }

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
View File

@@ -18,5 +18,5 @@ public interface IExperimentTestProcessService extends IService<ExperimentTestPr
void saveWithDetails(ExperimentTestProcess experimentTestProcess); void saveWithDetails(ExperimentTestProcess experimentTestProcess);
void copy(String experimentId); void copy(String oldExperimentId,String newExperimentId);
} }

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

@@ -117,14 +117,14 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
} }
@Override @Override
public void copy(String experimentId) { public void copy(String oldExperimentId,String newExperimentId){
ExperimentAnnealProcess experiment = new ExperimentAnnealProcess(); ExperimentAnnealProcess experiment = new ExperimentAnnealProcess();
BeanUtil.copyProperties(this, experiment); BeanUtil.copyProperties(getById(oldExperimentId), experiment);
experiment.setId(null); experiment.setId(null);
experiment.setExperimentId(experimentId); experiment.setExperimentId(newExperimentId);
experiment.setAnnealStartTime(null); experiment.setAnnealStartTime(null);
experiment.setAnnealEndTime(null); experiment.setAnnealEndTime(null);
List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId);
if (CollUtil.isNotEmpty(sampleInfoList)) { if (CollUtil.isNotEmpty(sampleInfoList)) {
experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining())); experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining()));
} else { } else {

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

@@ -107,11 +107,11 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
} }
@Override @Override
public void copy(String experimentId) { public void copy(String oldExperimentId,String newExperimentId) {
ExperimentRadiationProcess experiment = new ExperimentRadiationProcess(); ExperimentRadiationProcess experiment = new ExperimentRadiationProcess();
BeanUtil.copyProperties(this, experiment); BeanUtil.copyProperties(getById(oldExperimentId), experiment);
experiment.setId(null); experiment.setId(null);
experiment.setExperimentId(experimentId); experiment.setExperimentId(newExperimentId);
experiment.setRadiationStartTime(null); experiment.setRadiationStartTime(null);
experiment.setRadiationEndTime(null); experiment.setRadiationEndTime(null);
String radiationDetail = experiment.getRadiationDetail(); String radiationDetail = experiment.getRadiationDetail();
@@ -129,7 +129,7 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
} }
experiment.setRadiationDetail(jsonObject.toJSONString()); experiment.setRadiationDetail(jsonObject.toJSONString());
} }
List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId);
if (CollUtil.isNotEmpty(sampleInfoList)) { if (CollUtil.isNotEmpty(sampleInfoList)) {
experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining())); experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining()));
} else { } else {

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

@@ -78,14 +78,14 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTest
} }
@Override @Override
public void copy(String experimentId) { public void copy(String oldExperimentId, String newExperimentId) {
ExperimentTestProcess experiment = new ExperimentTestProcess(); ExperimentTestProcess experiment = new ExperimentTestProcess();
BeanUtil.copyProperties(this, experiment); BeanUtil.copyProperties(getById(oldExperimentId), experiment);
experiment.setExperimentId(experimentId); experiment.setExperimentId(newExperimentId);
experiment.setId(null); experiment.setId(null);
experiment.setTestStartTime(null); experiment.setTestStartTime(null);
experiment.setTestEndTime(null); experiment.setTestEndTime(null);
List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId);
if (CollUtil.isNotEmpty(sampleInfoList)) { if (CollUtil.isNotEmpty(sampleInfoList)) {
experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining())); experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining()));
} else { } else {