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
2024-11-27 10:05:29 +08:00
parent 5fcc8036cf
commit bc73884611
8 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -98,7 +98,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
} }
//ExperimentReport report = experimentReportService.getByExperimentId(experimentId); //ExperimentReport report = experimentReportService.getByExperimentId(experimentId);
//if (ObjUtil.isNotNull(report)) { //if (ObjUtil.isNotNull(report)) {
// return Result.error("试验试验报告已存在！"); // return Result.error("试验报告已存在！");
//} //}
experimentReport.setReportName(experiment.getName() + "-试验报告"); experimentReport.setReportName(experiment.getName() + "-试验报告");
experimentReportService.save(experimentReport); experimentReportService.save(experimentReport);

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.database.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess; import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
import java.util.List;
/** /**
* @Description: 退火过程 * @Description: 退火过程
* @Author: jeecg-boot * @Author: jeecg-boot
@@ -10,5 +12,5 @@ import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IExperimentAnnealProcessService extends IService<ExperimentAnnealProcess> { public interface IExperimentAnnealProcessService extends IService<ExperimentAnnealProcess> {
ExperimentAnnealProcess getByExperimentId(String experimentId); List<ExperimentAnnealProcess> getByExperimentId(String experimentId);
} }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentAnnealProcess; import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess; import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
import java.util.List;
/** /**
* @Description: 辐照过程 * @Description: 辐照过程
* @Author: jeecg-boot * @Author: jeecg-boot
@@ -11,6 +13,6 @@ import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IExperimentRadiationProcessService extends IService<ExperimentRadiationProcess> { public interface IExperimentRadiationProcessService extends IService<ExperimentRadiationProcess> {
ExperimentRadiationProcess getByExperimentId(String experimentId); List<ExperimentRadiationProcess> getByExperimentId(String experimentId);
} }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.database.entity.ExperimentRadiationProcess; import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
import org.jeecg.modules.database.entity.ExperimentTestProcess; import org.jeecg.modules.database.entity.ExperimentTestProcess;
import java.util.List;
/** /**
* @Description: 测试过程 * @Description: 测试过程
* @Author: jeecg-boot * @Author: jeecg-boot
@@ -11,6 +13,6 @@ import org.jeecg.modules.database.entity.ExperimentTestProcess;
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IExperimentTestProcessService extends IService<ExperimentTestProcess> { public interface IExperimentTestProcessService extends IService<ExperimentTestProcess> {
ExperimentTestProcess getByExperimentId(String experimentId); List<ExperimentTestProcess> getByExperimentId(String experimentId);
} }

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

@@ -7,6 +7,8 @@ import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper;
import org.jeecg.modules.database.service.IExperimentAnnealProcessService; import org.jeecg.modules.database.service.IExperimentAnnealProcessService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @Description: 退火过程 * @Description: 退火过程
* @Author: jeecg-boot * @Author: jeecg-boot
@@ -18,7 +20,7 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
implements IExperimentAnnealProcessService { implements IExperimentAnnealProcessService {
@Override @Override
public ExperimentAnnealProcess getByExperimentId(String experimentId) { public List<ExperimentAnnealProcess> getByExperimentId(String experimentId) {
return getOne(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId),false); return list(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId));
} }
} }

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

@@ -7,6 +7,8 @@ import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper;
import org.jeecg.modules.database.service.IExperimentRadiationProcessService; import org.jeecg.modules.database.service.IExperimentRadiationProcessService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @Description: 辐照过程 * @Description: 辐照过程
* @Author: jeecg-boot * @Author: jeecg-boot
@@ -18,7 +20,7 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
implements IExperimentRadiationProcessService { implements IExperimentRadiationProcessService {
@Override @Override
public ExperimentRadiationProcess getByExperimentId(String experimentId) { public List<ExperimentRadiationProcess> getByExperimentId(String experimentId) {
return getOne(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId),false); return list(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId));
} }
} }

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

@@ -7,6 +7,8 @@ import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper;
import org.jeecg.modules.database.service.IExperimentTestProcessService; import org.jeecg.modules.database.service.IExperimentTestProcessService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @Description: 测试过程 * @Description: 测试过程
* @Author: jeecg-boot * @Author: jeecg-boot
@@ -18,7 +20,7 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTest
implements IExperimentTestProcessService { implements IExperimentTestProcessService {
@Override @Override
public ExperimentTestProcess getByExperimentId(String experimentId) { public List<ExperimentTestProcess> getByExperimentId(String experimentId) {
return getOne(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId),false); return list(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId));
} }
} }