From d7dcbed2019dd9627499d6666c8530fd2e026fbe Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Mon, 7 Apr 2025 00:51:58 +0800
Subject: [PATCH] update

---
 .../modules/database/controller/ExperimentController.java | 6 +++---
 .../database/service/IExperimentAnnealProcessService.java | 2 +-
 .../service/IExperimentRadiationProcessService.java       | 2 +-
 .../database/service/IExperimentTestProcessService.java   | 2 +-
 .../service/impl/ExperimentAnnealProcessServiceImpl.java  | 8 ++++----
 .../impl/ExperimentRadiationProcessServiceImpl.java       | 8 ++++----
 .../service/impl/ExperimentTestProcessServiceImpl.java    | 8 ++++----
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 1e0ef19..83c9990 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -270,15 +270,15 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
 
         List<ExperimentAnnealProcess> experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId());
         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());
         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());
         if (CollUtil.isNotEmpty(experimentTestProcess)) {
-            experimentTestProcess.forEach(v -> experimentTestProcessService.copy(copied.getId()));
+            experimentTestProcess.forEach(v -> experimentTestProcessService.copy(old.getId(),copied.getId()));
         }
         return Result.OK("复制成功!");
     }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
index 71df770..082ebc9 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
@@ -18,5 +18,5 @@ public interface IExperimentAnnealProcessService extends IService<ExperimentAnne
 
     void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess);
 
-    void copy(String experimentId);
+    void copy(String oldExperimentId,String newExperimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
index e7142c0..8b5231a 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
@@ -18,5 +18,5 @@ public interface IExperimentRadiationProcessService extends IService<ExperimentR
 
     void saveWithDetails(ExperimentRadiationProcess experimentRadiationProcess);
 
-    void copy(String experimentId);
+    void copy(String oldExperimentId,String newExperimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
index 8dd6883..0d3bb2b 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
@@ -18,5 +18,5 @@ public interface IExperimentTestProcessService extends IService<ExperimentTestPr
 
     void saveWithDetails(ExperimentTestProcess experimentTestProcess);
 
-    void copy(String experimentId);
+    void copy(String oldExperimentId,String newExperimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
index aec3ea6..bdcf9b7 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
@@ -117,14 +117,14 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
     }
 
     @Override
-    public void copy(String experimentId) {
+    public void copy(String oldExperimentId,String newExperimentId){
         ExperimentAnnealProcess experiment = new ExperimentAnnealProcess();
-        BeanUtil.copyProperties(this, experiment);
+        BeanUtil.copyProperties(getById(oldExperimentId), experiment);
         experiment.setId(null);
-        experiment.setExperimentId(experimentId);
+        experiment.setExperimentId(newExperimentId);
         experiment.setAnnealStartTime(null);
         experiment.setAnnealEndTime(null);
-        List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId);
+        List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId);
         if (CollUtil.isNotEmpty(sampleInfoList)) {
             experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining()));
         } else {
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
index c6d9cb5..76c2f1e 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
@@ -107,11 +107,11 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
     }
 
     @Override
-    public void copy(String experimentId) {
+    public void copy(String oldExperimentId,String newExperimentId) {
         ExperimentRadiationProcess experiment = new ExperimentRadiationProcess();
-        BeanUtil.copyProperties(this, experiment);
+        BeanUtil.copyProperties(getById(oldExperimentId), experiment);
         experiment.setId(null);
-        experiment.setExperimentId(experimentId);
+        experiment.setExperimentId(newExperimentId);
         experiment.setRadiationStartTime(null);
         experiment.setRadiationEndTime(null);
         String radiationDetail = experiment.getRadiationDetail();
@@ -129,7 +129,7 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
             }
             experiment.setRadiationDetail(jsonObject.toJSONString());
         }
-        List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId);
+        List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId);
         if (CollUtil.isNotEmpty(sampleInfoList)) {
             experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining()));
         } else {
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java
index 9673f77..79ceaab 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java
@@ -78,14 +78,14 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTest
     }
 
     @Override
-    public void copy(String experimentId) {
+    public void copy(String oldExperimentId, String newExperimentId) {
         ExperimentTestProcess experiment = new ExperimentTestProcess();
-        BeanUtil.copyProperties(this, experiment);
-        experiment.setExperimentId(experimentId);
+        BeanUtil.copyProperties(getById(oldExperimentId), experiment);
+        experiment.setExperimentId(newExperimentId);
         experiment.setId(null);
         experiment.setTestStartTime(null);
         experiment.setTestEndTime(null);
-        List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId);
+        List<ExperimentSampleInfo> sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId);
         if (CollUtil.isNotEmpty(sampleInfoList)) {
             experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining()));
         } else {