update
This commit is contained in:
@@ -15,10 +15,8 @@ import org.jeecg.common.system.base.controller.JeecgController;
|
|||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.system.util.JwtUtil;
|
import org.jeecg.common.system.util.JwtUtil;
|
||||||
import org.jeecg.modules.database.constant.ExperimentStatus;
|
import org.jeecg.modules.database.constant.ExperimentStatus;
|
||||||
import org.jeecg.modules.database.entity.Experiment;
|
import org.jeecg.modules.database.entity.*;
|
||||||
import org.jeecg.modules.database.entity.ExperimentLog;
|
import org.jeecg.modules.database.service.*;
|
||||||
import org.jeecg.modules.database.service.IExperimentLogService;
|
|
||||||
import org.jeecg.modules.database.service.IExperimentService;
|
|
||||||
import org.jeecg.modules.system.entity.SysUser;
|
import org.jeecg.modules.system.entity.SysUser;
|
||||||
import org.jeecg.modules.system.service.ISysUserService;
|
import org.jeecg.modules.system.service.ISysUserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -39,11 +37,17 @@ import java.util.Arrays;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class ExperimentController extends JeecgController<Experiment, IExperimentService> {
|
public class ExperimentController extends JeecgController<Experiment, IExperimentService> {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IExperimentService experimentService;
|
private IExperimentService experimentService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IExperimentLogService experimentLogService;
|
private IExperimentLogService experimentLogService;
|
||||||
@Autowired
|
@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<Experiment, IExperimen
|
|||||||
//@RequiresPermissions("database:experiment:delete")
|
//@RequiresPermissions("database:experiment:delete")
|
||||||
@PostMapping(value = "/copy")
|
@PostMapping(value = "/copy")
|
||||||
public Result<String> copy(@RequestParam(name = "id", required = true) String id) {
|
public Result<String> copy(@RequestParam(name = "id", required = true) String id) {
|
||||||
Experiment experiment = experimentService.getById(id);
|
Experiment old = experimentService.getById(id);
|
||||||
experiment.setStatus(ExperimentStatus.PRE_TEST);
|
old.addCopyCount();
|
||||||
experiment.setId(null);
|
experimentService.updateById(old);
|
||||||
experimentService.save(experiment);
|
|
||||||
|
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("复制成功!");
|
return Result.OK("复制成功!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +1,19 @@
|
|||||||
package org.jeecg.modules.database.entity;
|
package org.jeecg.modules.database.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
|
import org.jeecg.modules.database.constant.ExperimentStatus;
|
||||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验管理
|
* @Description: 试验管理
|
||||||
@@ -45,7 +46,7 @@ public class Experiment implements Serializable {
|
|||||||
@JsonFormat(timezone = "GMT+8", pattern = "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")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "创建日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "试验开始日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "试验结束日期")
|
@Schema(description = "试验结束日期")
|
||||||
private Date endDate;
|
private Date endDate;
|
||||||
/**
|
/**
|
||||||
* 辐射源类型
|
* 辐射源类型
|
||||||
*/
|
*/
|
||||||
@@ -133,23 +134,48 @@ public class Experiment implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@Excel(name = "样品信息", width = 15)
|
@Excel(name = "样品信息", width = 15)
|
||||||
@Schema(description = "样品信息")
|
@Schema(description = "样品信息")
|
||||||
private String sampleInfo;
|
private String sampleInfo;
|
||||||
/**
|
/**
|
||||||
* 辐照板
|
* 辐照板
|
||||||
*/
|
*/
|
||||||
@Excel(name = "辐照板", width = 15)
|
@Excel(name = "辐照板", width = 15)
|
||||||
@Schema(description = "辐照板")
|
@Schema(description = "辐照板")
|
||||||
private String irradiationBoard;
|
private String irradiationBoard;
|
||||||
/**
|
/**
|
||||||
* 偏置条件
|
* 偏置条件
|
||||||
*/
|
*/
|
||||||
@Excel(name = "偏置条件", width = 15)
|
@Excel(name = "偏置条件", width = 15)
|
||||||
@Schema(description = "偏置条件")
|
@Schema(description = "偏置条件")
|
||||||
private String deviationCondition;
|
private String deviationCondition;
|
||||||
/**
|
/**
|
||||||
* 加偏设备
|
* 加偏设备
|
||||||
*/
|
*/
|
||||||
@Excel(name = "加偏设备", width = 15)
|
@Excel(name = "加偏设备", width = 15)
|
||||||
@Schema(description = "加偏设备")
|
@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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package org.jeecg.modules.database.entity;
|
package org.jeecg.modules.database.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -45,7 +44,7 @@ public class ExperimentAnnealProcess implements Serializable {
|
|||||||
@JsonFormat(timezone = "GMT+8", pattern = "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")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "创建日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "退火开始时间")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "退火结束时间")
|
@Schema(description = "退火结束时间")
|
||||||
private Date annealEndTime;
|
private Date annealEndTime;
|
||||||
/**
|
/**
|
||||||
* 偏置条件
|
* 偏置条件
|
||||||
*/
|
*/
|
||||||
@@ -139,4 +138,14 @@ public class ExperimentAnnealProcess implements Serializable {
|
|||||||
@Excel(name = "加偏设备", width = 15)
|
@Excel(name = "加偏设备", width = 15)
|
||||||
@Schema(description = "加偏设备(json 大字段)")
|
@Schema(description = "加偏设备(json 大字段)")
|
||||||
private String biasEquipment;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package org.jeecg.modules.database.entity;
|
package org.jeecg.modules.database.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -45,7 +44,7 @@ public class ExperimentRadiationProcess implements Serializable {
|
|||||||
@JsonFormat(timezone = "GMT+8", pattern = "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")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "创建日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新日期")
|
@Schema(description = "更新日期")
|
||||||
private Date updateTime;
|
private Date updateTime;
|
||||||
/**
|
/**
|
||||||
* 所属部门
|
* 所属部门
|
||||||
*/
|
*/
|
||||||
@@ -111,4 +110,31 @@ public class ExperimentRadiationProcess implements Serializable {
|
|||||||
@Excel(name = "试验ID", width = 15)
|
@Excel(name = "试验ID", width = 15)
|
||||||
@Schema(description = "试验ID")
|
@Schema(description = "试验ID")
|
||||||
private String experimentId;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
package org.jeecg.modules.database.entity;
|
package org.jeecg.modules.database.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -45,7 +44,7 @@ public class ExperimentTestProcess implements Serializable {
|
|||||||
@JsonFormat(timezone = "GMT+8", pattern = "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")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "创建日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "更新日期")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "测试开始时间")
|
@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")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@Schema(description = "测试结束时间")
|
@Schema(description = "测试结束时间")
|
||||||
private Date testEndTime;
|
private Date testEndTime;
|
||||||
/**
|
/**
|
||||||
* 环境湿度
|
* 环境湿度
|
||||||
*/
|
*/
|
||||||
@@ -175,4 +174,14 @@ public class ExperimentTestProcess implements Serializable {
|
|||||||
@Excel(name = "测试结果", width = 15)
|
@Excel(name = "测试结果", width = 15)
|
||||||
@Schema(description = "测试结果")
|
@Schema(description = "测试结果")
|
||||||
private String testResult;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,5 +10,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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.ExperimentDoc;
|
import org.jeecg.modules.database.entity.ExperimentDoc;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验文档
|
* @Description: 试验文档
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
@@ -13,4 +15,6 @@ public interface IExperimentDocService extends IService<ExperimentDoc> {
|
|||||||
|
|
||||||
ExperimentDoc generate(String experimentId, String type);
|
ExperimentDoc generate(String experimentId, String type);
|
||||||
|
|
||||||
|
List<ExperimentDoc> getByExperimentId(String experimentId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,9 @@ 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.ExperimentLog;
|
import org.jeecg.modules.database.entity.ExperimentLog;
|
||||||
|
import org.jeecg.modules.database.entity.ExperimentTestProcess;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验日志
|
* @Description: 试验日志
|
||||||
@@ -10,5 +13,5 @@ import org.jeecg.modules.database.entity.ExperimentLog;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface IExperimentLogService extends IService<ExperimentLog> {
|
public interface IExperimentLogService extends IService<ExperimentLog> {
|
||||||
|
List<ExperimentLog> getByExperimentId(String experimentId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.jeecg.modules.database.service;
|
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.ExperimentRadiationProcess;
|
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -10,5 +11,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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
package org.jeecg.modules.database.service;
|
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.ExperimentLog;
|
||||||
import org.jeecg.modules.database.entity.ExperimentReport;
|
import org.jeecg.modules.database.entity.ExperimentReport;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验报告
|
* @Description: 试验报告
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
@@ -10,5 +13,6 @@ import org.jeecg.modules.database.entity.ExperimentReport;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface IExperimentReportService extends IService<ExperimentReport> {
|
public interface IExperimentReportService extends IService<ExperimentReport> {
|
||||||
|
ExperimentReport getByExperimentId(String experimentId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.jeecg.modules.database.service;
|
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.ExperimentReport;
|
||||||
import org.jeecg.modules.database.entity.ExperimentReview;
|
import org.jeecg.modules.database.entity.ExperimentReview;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -10,5 +11,6 @@ import org.jeecg.modules.database.entity.ExperimentReview;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface IExperimentReviewService extends IService<ExperimentReview> {
|
public interface IExperimentReviewService extends IService<ExperimentReview> {
|
||||||
|
ExperimentReview getByExperimentId(String experimentId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.jeecg.modules.database.service;
|
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.ExperimentRadiationProcess;
|
||||||
import org.jeecg.modules.database.entity.ExperimentTestProcess;
|
import org.jeecg.modules.database.entity.ExperimentTestProcess;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -10,5 +11,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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.ExperimentUser;
|
import org.jeecg.modules.database.entity.ExperimentUser;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验人员
|
* @Description: 试验人员
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
@@ -10,5 +12,6 @@ import org.jeecg.modules.database.entity.ExperimentUser;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
public interface IExperimentUserService extends IService<ExperimentUser> {
|
public interface IExperimentUserService extends IService<ExperimentUser> {
|
||||||
|
List<ExperimentUser> getByExperimentId(String experimentId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
|
import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper;
|
import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper;
|
||||||
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAnnealProcessMapper, ExperimentAnnealProcess> implements IExperimentAnnealProcessService {
|
public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAnnealProcessMapper, ExperimentAnnealProcess>
|
||||||
|
implements IExperimentAnnealProcessService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExperimentAnnealProcess getByExperimentId(String experimentId) {
|
||||||
|
return getOne(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,4 +91,9 @@ public class ExperimentDocServiceImpl extends ServiceImpl<ExperimentDocMapper, E
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ExperimentDoc> getByExperimentId(String experimentId) {
|
||||||
|
return list(new LambdaQueryWrapper<ExperimentDoc>().eq(ExperimentDoc::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.jeecg.modules.database.entity.ExperimentLog;
|
import org.jeecg.modules.database.entity.ExperimentLog;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentLogMapper;
|
import org.jeecg.modules.database.mapper.ExperimentLogMapper;
|
||||||
import org.jeecg.modules.database.service.IExperimentLogService;
|
import org.jeecg.modules.database.service.IExperimentLogService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验日志
|
* @Description: 试验日志
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
@@ -15,4 +18,8 @@ import org.springframework.stereotype.Service;
|
|||||||
@Service
|
@Service
|
||||||
public class ExperimentLogServiceImpl extends ServiceImpl<ExperimentLogMapper, ExperimentLog> implements IExperimentLogService {
|
public class ExperimentLogServiceImpl extends ServiceImpl<ExperimentLogMapper, ExperimentLog> implements IExperimentLogService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ExperimentLog> getByExperimentId(String experimentId) {
|
||||||
|
return list(new LambdaQueryWrapper<ExperimentLog>().eq(ExperimentLog::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
|
import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper;
|
import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper;
|
||||||
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<ExperimentRadiationProcessMapper, ExperimentRadiationProcess> implements IExperimentRadiationProcessService {
|
public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<ExperimentRadiationProcessMapper, ExperimentRadiationProcess>
|
||||||
|
implements IExperimentRadiationProcessService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExperimentRadiationProcess getByExperimentId(String experimentId) {
|
||||||
|
return getOne(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
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.entity.ExperimentReport;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentReportMapper;
|
import org.jeecg.modules.database.mapper.ExperimentReportMapper;
|
||||||
import org.jeecg.modules.database.service.IExperimentReportService;
|
import org.jeecg.modules.database.service.IExperimentReportService;
|
||||||
@@ -15,4 +17,8 @@ import org.springframework.stereotype.Service;
|
|||||||
@Service
|
@Service
|
||||||
public class ExperimentReportServiceImpl extends ServiceImpl<ExperimentReportMapper, ExperimentReport> implements IExperimentReportService {
|
public class ExperimentReportServiceImpl extends ServiceImpl<ExperimentReportMapper, ExperimentReport> implements IExperimentReportService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExperimentReport getByExperimentId(String experimentId) {
|
||||||
|
return getOne(new LambdaQueryWrapper<ExperimentReport>().eq(ExperimentReport::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
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.entity.ExperimentReview;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentReviewMapper;
|
import org.jeecg.modules.database.mapper.ExperimentReviewMapper;
|
||||||
import org.jeecg.modules.database.service.IExperimentReviewService;
|
import org.jeecg.modules.database.service.IExperimentReviewService;
|
||||||
@@ -15,4 +17,8 @@ import org.springframework.stereotype.Service;
|
|||||||
@Service
|
@Service
|
||||||
public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewMapper, ExperimentReview> implements IExperimentReviewService {
|
public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewMapper, ExperimentReview> implements IExperimentReviewService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExperimentReview getByExperimentId(String experimentId) {
|
||||||
|
return getOne(new LambdaQueryWrapper<ExperimentReview>().eq(ExperimentReview::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.jeecg.modules.database.entity.ExperimentTestProcess;
|
import org.jeecg.modules.database.entity.ExperimentTestProcess;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper;
|
import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper;
|
||||||
@@ -13,6 +14,11 @@ import org.springframework.stereotype.Service;
|
|||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTestProcessMapper, ExperimentTestProcess> implements IExperimentTestProcessService {
|
public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTestProcessMapper, ExperimentTestProcess>
|
||||||
|
implements IExperimentTestProcessService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ExperimentTestProcess getByExperimentId(String experimentId) {
|
||||||
|
return getOne(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
package org.jeecg.modules.database.service.impl;
|
package org.jeecg.modules.database.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.jeecg.modules.database.entity.ExperimentUser;
|
import org.jeecg.modules.database.entity.ExperimentUser;
|
||||||
import org.jeecg.modules.database.mapper.ExperimentUserMapper;
|
import org.jeecg.modules.database.mapper.ExperimentUserMapper;
|
||||||
import org.jeecg.modules.database.service.IExperimentUserService;
|
import org.jeecg.modules.database.service.IExperimentUserService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 试验人员
|
* @Description: 试验人员
|
||||||
* @Author: jeecg-boot
|
* @Author: jeecg-boot
|
||||||
@@ -15,4 +18,8 @@ import org.springframework.stereotype.Service;
|
|||||||
@Service
|
@Service
|
||||||
public class ExperimentUserServiceImpl extends ServiceImpl<ExperimentUserMapper, ExperimentUser> implements IExperimentUserService {
|
public class ExperimentUserServiceImpl extends ServiceImpl<ExperimentUserMapper, ExperimentUser> implements IExperimentUserService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ExperimentUser> getByExperimentId(String experimentId) {
|
||||||
|
return list(new LambdaQueryWrapper<ExperimentUser>().eq(ExperimentUser::getExperimentId, experimentId));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user