From 959e7720a3f7b43a197db98f82f55736a463f440 Mon Sep 17 00:00:00 2001 From: ls Date: Thu, 14 Nov 2024 00:33:02 +0800 Subject: [PATCH] update --- .../controller/ExperimentController.java | 35 +++++++++----- .../modules/database/entity/Experiment.java | 48 ++++++++++++++----- .../entity/ExperimentAnnealProcess.java | 23 ++++++--- .../entity/ExperimentRadiationProcess.java | 36 ++++++++++++-- .../entity/ExperimentTestProcess.java | 23 ++++++--- .../IExperimentAnnealProcessService.java | 2 +- .../service/IExperimentDocService.java | 4 ++ .../service/IExperimentLogService.java | 5 +- .../IExperimentRadiationProcessService.java | 2 + .../service/IExperimentReportService.java | 4 ++ .../service/IExperimentReviewService.java | 2 + .../IExperimentTestProcessService.java | 2 + .../service/IExperimentUserService.java | 3 ++ .../ExperimentAnnealProcessServiceImpl.java | 8 +++- .../impl/ExperimentDocServiceImpl.java | 5 ++ .../impl/ExperimentLogServiceImpl.java | 7 +++ ...ExperimentRadiationProcessServiceImpl.java | 8 +++- .../impl/ExperimentReportServiceImpl.java | 6 +++ .../impl/ExperimentReviewServiceImpl.java | 6 +++ .../ExperimentTestProcessServiceImpl.java | 8 +++- .../impl/ExperimentUserServiceImpl.java | 7 +++ 21 files changed, 198 insertions(+), 46 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 20c8f44..0dca6e7 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 @@ -15,10 +15,8 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.modules.database.constant.ExperimentStatus; -import org.jeecg.modules.database.entity.Experiment; -import org.jeecg.modules.database.entity.ExperimentLog; -import org.jeecg.modules.database.service.IExperimentLogService; -import org.jeecg.modules.database.service.IExperimentService; +import org.jeecg.modules.database.entity.*; +import org.jeecg.modules.database.service.*; import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -39,11 +37,17 @@ import java.util.Arrays; @Slf4j public class ExperimentController extends JeecgController { @Autowired - private IExperimentService experimentService; + private IExperimentService experimentService; @Autowired - private IExperimentLogService experimentLogService; + private IExperimentLogService experimentLogService; @Autowired - private ISysUserService userService; + private IExperimentAnnealProcessService experimentAnnealProcessService; + @Autowired + private IExperimentRadiationProcessService experimentRadiationProcessService; + @Autowired + private IExperimentTestProcessService experimentTestProcessService; + @Autowired + private ISysUserService userService; /** * 分页列表查询 @@ -139,10 +143,19 @@ public class ExperimentController extends JeecgController copy(@RequestParam(name = "id", required = true) String id) { - Experiment experiment = experimentService.getById(id); - experiment.setStatus(ExperimentStatus.PRE_TEST); - experiment.setId(null); - experimentService.save(experiment); + Experiment old = experimentService.getById(id); + old.addCopyCount(); + experimentService.updateById(old); + + Experiment copied = old.copy(); + experimentService.save(copied); + + ExperimentAnnealProcess experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId()); + experimentAnnealProcessService.save(experimentAnnealProcess.copy(copied.getId())); + ExperimentRadiationProcess experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId()); + experimentRadiationProcessService.save(experimentRadiationProcess.copy(copied.getId())); + ExperimentTestProcess experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId()); + experimentTestProcessService.save(experimentTestProcess.copy(copied.getId())); return Result.OK("复制成功!"); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index 66b6539..40d7d30 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -1,18 +1,19 @@ package org.jeecg.modules.database.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.modules.database.constant.ExperimentStatus; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; +import java.util.Objects; /** * @Description: 试验管理 @@ -45,7 +46,7 @@ public class Experiment implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") - private Date createTime; + private Date createTime; /** * 更新人 */ @@ -57,7 +58,7 @@ public class Experiment implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") - private Date updateTime; + private Date updateTime; /** * 所属部门 */ @@ -88,7 +89,7 @@ public class Experiment implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "试验开始日期") - private Date startDate; + private Date startDate; /** * 试验日期 */ @@ -96,7 +97,7 @@ public class Experiment implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "试验结束日期") - private Date endDate; + private Date endDate; /** * 辐射源类型 */ @@ -133,23 +134,48 @@ public class Experiment implements Serializable { */ @Excel(name = "样品信息", width = 15) @Schema(description = "样品信息") - private String sampleInfo; + private String sampleInfo; /** * 辐照板 */ @Excel(name = "辐照板", width = 15) @Schema(description = "辐照板") - private String irradiationBoard; + private String irradiationBoard; /** * 偏置条件 */ @Excel(name = "偏置条件", width = 15) @Schema(description = "偏置条件") - private String deviationCondition; + private String deviationCondition; /** * 加偏设备 */ @Excel(name = "加偏设备", width = 15) @Schema(description = "加偏设备") - private String deviationEquipment; + private String deviationEquipment; + /** + * 复制次数 + */ + @Excel(name = "复制次数", width = 15) + @Schema(description = "复制次数") + private Integer copyCount = 0; + + public void addCopyCount() { + if (Objects.isNull(copyCount)) { + setCopyCount(1); + } + setCopyCount(copyCount + 1); + } + + public Experiment copy() { + Experiment experiment = new Experiment(); + BeanUtil.copyProperties(this, experiment); + experiment.setName(this.name + "-" + getCopyCount()); + experiment.setId(null); + experiment.setCopyCount(0); + experiment.setStatus(ExperimentStatus.PRE_TEST); + experiment.setStartDate(null); + experiment.setEndDate(null); + return experiment; + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java index b13759e..fa55781 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java @@ -1,8 +1,7 @@ package org.jeecg.modules.database.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -45,7 +44,7 @@ public class ExperimentAnnealProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") - private Date createTime; + private Date createTime; /** * 更新人 */ @@ -57,7 +56,7 @@ public class ExperimentAnnealProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") - private Date updateTime; + private Date updateTime; /** * 所属部门 */ @@ -118,7 +117,7 @@ public class ExperimentAnnealProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "退火开始时间") - private Date annealStartTime; + private Date annealStartTime; /** * 退火结束时间 */ @@ -126,7 +125,7 @@ public class ExperimentAnnealProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "退火结束时间") - private Date annealEndTime; + private Date annealEndTime; /** * 偏置条件 */ @@ -139,4 +138,14 @@ public class ExperimentAnnealProcess implements Serializable { @Excel(name = "加偏设备", width = 15) @Schema(description = "加偏设备(json 大字段)") private String biasEquipment; + + public ExperimentAnnealProcess copy(String experimentId) { + ExperimentAnnealProcess experiment = new ExperimentAnnealProcess(); + BeanUtil.copyProperties(this, experiment); + experiment.setId(null); + experiment.setExperimentId(experimentId); + experiment.setAnnealStartTime(null); + experiment.setAnnealEndTime(null); + return experiment; + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java index 95c97d5..83a93f2 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentRadiationProcess.java @@ -1,8 +1,7 @@ package org.jeecg.modules.database.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -45,7 +44,7 @@ public class ExperimentRadiationProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") - private Date createTime; + private Date createTime; /** * 更新人 */ @@ -57,7 +56,7 @@ public class ExperimentRadiationProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") - private Date updateTime; + private Date updateTime; /** * 所属部门 */ @@ -111,4 +110,31 @@ public class ExperimentRadiationProcess implements Serializable { @Excel(name = "试验ID", width = 15) @Schema(description = "试验ID") private String experimentId; + + /** + * 辐照开始时间 + */ + @Excel(name = "辐照开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "辐照开始时间") + private Date radiationStartTime; + /** + * 辐照结束时间 + */ + @Excel(name = "辐照结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "辐照结束时间") + private Date radiationEndTime; + + public ExperimentRadiationProcess copy(String experimentId) { + ExperimentRadiationProcess experiment = new ExperimentRadiationProcess(); + BeanUtil.copyProperties(this, experiment); + experiment.setId(null); + experiment.setExperimentId(experimentId); + experiment.setRadiationStartTime(null); + experiment.setRadiationEndTime(null); + return experiment; + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java index df5156b..2fa6e53 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java @@ -1,8 +1,7 @@ package org.jeecg.modules.database.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -45,7 +44,7 @@ public class ExperimentTestProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") - private Date createTime; + private Date createTime; /** * 更新人 */ @@ -57,7 +56,7 @@ public class ExperimentTestProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") - private Date updateTime; + private Date updateTime; /** * 所属部门 */ @@ -118,7 +117,7 @@ public class ExperimentTestProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "测试开始时间") - private Date testStartTime; + private Date testStartTime; /** * 测试结束时间 */ @@ -126,7 +125,7 @@ public class ExperimentTestProcess implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "测试结束时间") - private Date testEndTime; + private Date testEndTime; /** * 环境湿度 */ @@ -175,4 +174,14 @@ public class ExperimentTestProcess implements Serializable { @Excel(name = "测试结果", width = 15) @Schema(description = "测试结果") private String testResult; + + public ExperimentTestProcess copy(String experimentId) { + ExperimentTestProcess experiment = new ExperimentTestProcess(); + BeanUtil.copyProperties(this, experiment); + experiment.setExperimentId(experimentId); + experiment.setId(null); + experiment.setTestStartTime(null); + experiment.setTestEndTime(null); + return experiment; + } } 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 f09a89a..2b0b4bd 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 @@ -10,5 +10,5 @@ import org.jeecg.modules.database.entity.ExperimentAnnealProcess; * @Version: V1.0 */ public interface IExperimentAnnealProcessService extends IService { - + ExperimentAnnealProcess getByExperimentId(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java index 8451381..8b04595 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentDocService.java @@ -3,6 +3,8 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.ExperimentDoc; +import java.util.List; + /** * @Description: 试验文档 * @Author: jeecg-boot @@ -13,4 +15,6 @@ public interface IExperimentDocService extends IService { ExperimentDoc generate(String experimentId, String type); + List getByExperimentId(String experimentId); + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java index 6c427ea..219c7d9 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentLogService.java @@ -2,6 +2,9 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.ExperimentLog; +import org.jeecg.modules.database.entity.ExperimentTestProcess; + +import java.util.List; /** * @Description: 试验日志 @@ -10,5 +13,5 @@ import org.jeecg.modules.database.entity.ExperimentLog; * @Version: V1.0 */ public interface IExperimentLogService extends IService { - + List getByExperimentId(String experimentId); } 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 0c4cac3..d641c2f 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 @@ -1,6 +1,7 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.entity.ExperimentAnnealProcess; import org.jeecg.modules.database.entity.ExperimentRadiationProcess; /** @@ -10,5 +11,6 @@ import org.jeecg.modules.database.entity.ExperimentRadiationProcess; * @Version: V1.0 */ public interface IExperimentRadiationProcessService extends IService { + ExperimentRadiationProcess getByExperimentId(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReportService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReportService.java index 2434382..44a2c7a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReportService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReportService.java @@ -1,8 +1,11 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.entity.ExperimentLog; import org.jeecg.modules.database.entity.ExperimentReport; +import java.util.List; + /** * @Description: 试验报告 * @Author: jeecg-boot @@ -10,5 +13,6 @@ import org.jeecg.modules.database.entity.ExperimentReport; * @Version: V1.0 */ public interface IExperimentReportService extends IService { + ExperimentReport getByExperimentId(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java index 7d53e57..949cb99 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentReviewService.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.entity.ExperimentReport; import org.jeecg.modules.database.entity.ExperimentReview; /** @@ -10,5 +11,6 @@ import org.jeecg.modules.database.entity.ExperimentReview; * @Version: V1.0 */ public interface IExperimentReviewService extends IService { + ExperimentReview getByExperimentId(String experimentId); } 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 e42ba66..6789053 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 @@ -1,6 +1,7 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.entity.ExperimentRadiationProcess; import org.jeecg.modules.database.entity.ExperimentTestProcess; /** @@ -10,5 +11,6 @@ import org.jeecg.modules.database.entity.ExperimentTestProcess; * @Version: V1.0 */ public interface IExperimentTestProcessService extends IService { + ExperimentTestProcess getByExperimentId(String experimentId); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentUserService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentUserService.java index e102cf1..c654eb1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentUserService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentUserService.java @@ -3,6 +3,8 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.ExperimentUser; +import java.util.List; + /** * @Description: 试验人员 * @Author: jeecg-boot @@ -10,5 +12,6 @@ import org.jeecg.modules.database.entity.ExperimentUser; * @Version: V1.0 */ public interface IExperimentUserService extends IService { + List getByExperimentId(String experimentId); } 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 923ba5e..3b7c160 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.database.entity.ExperimentAnnealProcess; import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper; @@ -13,6 +14,11 @@ import org.springframework.stereotype.Service; * @Version: V1.0 */ @Service -public class ExperimentAnnealProcessServiceImpl extends ServiceImpl implements IExperimentAnnealProcessService { +public class ExperimentAnnealProcessServiceImpl extends ServiceImpl + implements IExperimentAnnealProcessService { + @Override + public ExperimentAnnealProcess getByExperimentId(String experimentId) { + return getOne(new LambdaQueryWrapper().eq(ExperimentAnnealProcess::getExperimentId, experimentId)); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index c600617..35e072a 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -91,4 +91,9 @@ public class ExperimentDocServiceImpl extends ServiceImpl getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentDoc::getExperimentId, experimentId)); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentLogServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentLogServiceImpl.java index 8e00543..5094287 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentLogServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentLogServiceImpl.java @@ -1,11 +1,14 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.database.entity.ExperimentLog; import org.jeecg.modules.database.mapper.ExperimentLogMapper; import org.jeecg.modules.database.service.IExperimentLogService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 试验日志 * @Author: jeecg-boot @@ -15,4 +18,8 @@ import org.springframework.stereotype.Service; @Service public class ExperimentLogServiceImpl extends ServiceImpl implements IExperimentLogService { + @Override + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentLog::getExperimentId, experimentId)); + } } 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 ac95eea..36a0b0a 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.database.entity.ExperimentRadiationProcess; import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper; @@ -13,6 +14,11 @@ import org.springframework.stereotype.Service; * @Version: V1.0 */ @Service -public class ExperimentRadiationProcessServiceImpl extends ServiceImpl implements IExperimentRadiationProcessService { +public class ExperimentRadiationProcessServiceImpl extends ServiceImpl + implements IExperimentRadiationProcessService { + @Override + public ExperimentRadiationProcess getByExperimentId(String experimentId) { + return getOne(new LambdaQueryWrapper().eq(ExperimentRadiationProcess::getExperimentId, experimentId)); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java index 2c72729..45843d4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReportServiceImpl.java @@ -1,6 +1,8 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.database.entity.ExperimentRadiationProcess; import org.jeecg.modules.database.entity.ExperimentReport; import org.jeecg.modules.database.mapper.ExperimentReportMapper; import org.jeecg.modules.database.service.IExperimentReportService; @@ -15,4 +17,8 @@ import org.springframework.stereotype.Service; @Service public class ExperimentReportServiceImpl extends ServiceImpl implements IExperimentReportService { + @Override + public ExperimentReport getByExperimentId(String experimentId) { + return getOne(new LambdaQueryWrapper().eq(ExperimentReport::getExperimentId, experimentId)); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 3671573..2202434 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java @@ -1,6 +1,8 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.database.entity.ExperimentReport; import org.jeecg.modules.database.entity.ExperimentReview; import org.jeecg.modules.database.mapper.ExperimentReviewMapper; import org.jeecg.modules.database.service.IExperimentReviewService; @@ -15,4 +17,8 @@ import org.springframework.stereotype.Service; @Service public class ExperimentReviewServiceImpl extends ServiceImpl implements IExperimentReviewService { + @Override + public ExperimentReview getByExperimentId(String experimentId) { + return getOne(new LambdaQueryWrapper().eq(ExperimentReview::getExperimentId, experimentId)); + } } 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 23ee49e..a3d0243 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 @@ -1,5 +1,6 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.database.entity.ExperimentTestProcess; import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper; @@ -13,6 +14,11 @@ import org.springframework.stereotype.Service; * @Version: V1.0 */ @Service -public class ExperimentTestProcessServiceImpl extends ServiceImpl implements IExperimentTestProcessService { +public class ExperimentTestProcessServiceImpl extends ServiceImpl + implements IExperimentTestProcessService { + @Override + public ExperimentTestProcess getByExperimentId(String experimentId) { + return getOne(new LambdaQueryWrapper().eq(ExperimentTestProcess::getExperimentId, experimentId)); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentUserServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentUserServiceImpl.java index f680b29..3bbc0c5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentUserServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentUserServiceImpl.java @@ -1,11 +1,14 @@ package org.jeecg.modules.database.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.database.entity.ExperimentUser; import org.jeecg.modules.database.mapper.ExperimentUserMapper; import org.jeecg.modules.database.service.IExperimentUserService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 试验人员 * @Author: jeecg-boot @@ -15,4 +18,8 @@ import org.springframework.stereotype.Service; @Service public class ExperimentUserServiceImpl extends ServiceImpl implements IExperimentUserService { + @Override + public List getByExperimentId(String experimentId) { + return list(new LambdaQueryWrapper().eq(ExperimentUser::getExperimentId, experimentId)); + } }