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-19 11:50:12 +08:00
parent 9ef7a8e909
commit 293f584b10
9 changed files with 258 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentStatus.java
View File

@@ -4,5 +4,6 @@ public interface ExperimentStatus {
String PRE_TEST = "试验前";
String PROGRESSING = "试验进行中";
String REPORT_AUDITING = "报告审批中";
String COMPLETED = "试验完成";
}

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

@@ -16,6 +16,7 @@ import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.database.entity.Equipment;
import org.jeecg.modules.database.service.IEquipmentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -68,7 +69,13 @@ public class EquipmentController extends JeecgController<Equipment, IEquipmentSe
@RequiresPermissions("database:equipment:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody Equipment equipment) {
equipmentService.save(equipment);
try {
equipmentService.save(equipment);
} catch (DuplicateKeyException e) {
return Result.error("设备已存在！");
} catch (Exception e) {
return Result.error("添加成失败！");
}
return Result.OK("添加成功！");
}

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

@@ -16,12 +16,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.ExperimentAnnealProcess;
import org.jeecg.modules.database.entity.ExperimentLog;
import org.jeecg.modules.database.service.IExperimentAnnealProcessService;
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;
@@ -29,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
import java.util.Objects;
/**
* @Description: 退火过程
@@ -44,12 +41,11 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
@Autowired
private IExperimentAnnealProcessService experimentAnnealProcessService;
@Autowired
private ISysUserService userService;
@Autowired
private IExperimentService experimentService;
private IExperimentService experimentService;
@Autowired
private IExperimentLogService experimentLogService;
@@ -69,7 +65,8 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ExperimentAnnealProcess> queryWrapper = QueryGenerator.initQueryWrapper(experimentAnnealProcess, req.getParameterMap());
QueryWrapper<ExperimentAnnealProcess> queryWrapper = QueryGenerator.initQueryWrapper(experimentAnnealProcess,
req.getParameterMap());
Page<ExperimentAnnealProcess> page = new Page<ExperimentAnnealProcess>(pageNo, pageSize);
IPage<ExperimentAnnealProcess> pageList = experimentAnnealProcessService.page(page, queryWrapper);
return Result.OK(pageList);
@@ -86,11 +83,17 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
@RequiresPermissions("database:experiment_anneal_process:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentAnnealProcess experimentAnnealProcess, HttpServletRequest request) {
experimentAnnealProcessService.save(experimentAnnealProcess);
String experimentId = experimentAnnealProcess.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
Experiment experiment = new Experiment();
experiment.setId(experimentId);
experiment.setStatus(ExperimentStatus.PROGRESSING);
@@ -103,6 +106,8 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentAnnealProcessService.save(experimentAnnealProcess);
return Result.OK("添加成功！");
}
@@ -117,16 +122,32 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
@RequiresPermissions("database:experiment_anneal_process:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentAnnealProcess experimentAnnealProcess, HttpServletRequest request) {
experimentAnnealProcessService.updateById(experimentAnnealProcess);
ExperimentAnnealProcess byId = experimentAnnealProcessService.getById(experimentAnnealProcess.getId());
String experimentId = byId.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
Experiment experiment = new Experiment();
experiment.setId(experimentId);
experiment.setStatus(ExperimentStatus.PROGRESSING);
experimentService.updateById(experiment);
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentAnnealProcess.getExperimentId());
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentAnnealProcessService.updateById(experimentAnnealProcess);
return Result.OK("编辑成功!");
}
@@ -141,15 +162,28 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
@RequiresPermissions("database:experiment_anneal_process:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) {
experimentAnnealProcessService.removeById(id);
ExperimentAnnealProcess experimentAnnealProcess = experimentAnnealProcessService.getById(id);
String experimentId = experimentAnnealProcess.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(id);
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentAnnealProcessService.removeById(id);
return Result.OK("删除成功!");
}

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

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
import java.util.Objects;
/**
* @Description: 辐照过程
@@ -83,11 +84,18 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
@RequiresPermissions("database:experiment_radiation_process:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentRadiationProcess experimentRadiationProcess, HttpServletRequest request) {
experimentRadiationProcessService.save(experimentRadiationProcess);
String experimentId = experimentRadiationProcess.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
Experiment experiment = new Experiment();
experiment.setId(experimentId);
experiment.setStatus(ExperimentStatus.PROGRESSING);
@@ -100,6 +108,8 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentRadiationProcessService.save(experimentRadiationProcess);
return Result.OK("添加成功！");
}
@@ -114,16 +124,31 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
@RequiresPermissions("database:experiment_radiation_process:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentRadiationProcess experimentRadiationProcess, HttpServletRequest request) {
experimentRadiationProcessService.updateById(experimentRadiationProcess);
ExperimentRadiationProcess byId = experimentRadiationProcessService.getById(experimentRadiationProcess.getId());
String experimentId = byId.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
Experiment experiment = new Experiment();
experiment.setId(experimentId);
experiment.setStatus(ExperimentStatus.PROGRESSING);
experimentService.updateById(experiment);
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(byId.getExperimentId());
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentRadiationProcessService.updateById(experimentRadiationProcess);
return Result.OK("编辑成功!");
}
@@ -139,16 +164,27 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
@RequiresPermissions("database:experiment_radiation_process:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) {
experimentRadiationProcessService.removeById(id);
ExperimentRadiationProcess byId = experimentRadiationProcessService.getById(id);
ExperimentRadiationProcess experimentRadiationProcess = experimentRadiationProcessService.getById(id);
String experimentId = experimentRadiationProcess.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(byId.getExperimentId());
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentRadiationProcessService.removeById(id);
return Result.OK("删除成功!");
}

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

@@ -268,12 +268,16 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
}
experimentReportService.updateById(report);
Experiment experiment = new Experiment();
experiment.setId(report.getExperimentId());
if (StringUtils.equals(report.getStatus(), "PASSED")) {
Experiment experiment = new Experiment();
experiment.setId(report.getExperimentId());
experiment.setStatus(ExperimentStatus.COMPLETED);
experimentService.updateById(experiment);
} else if (StringUtils.equals(report.getStatus(), "REJECT")) {
experiment.setStatus(ExperimentStatus.PROGRESSING);
} else {
experiment.setStatus(ExperimentStatus.REPORT_AUDITING);
}
experimentService.updateById(experiment);
return Result.OK("审核成功!");
}

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

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
import java.util.Objects;
/**
* @Description: 测试过程
@@ -82,11 +83,17 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
@RequiresPermissions("database:experiment_test_process:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ExperimentTestProcess experimentTestProcess, HttpServletRequest request) {
experimentTestProcessService.save(experimentTestProcess);
String experimentId = experimentTestProcess.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
Experiment experiment = new Experiment();
experiment.setId(experimentId);
experiment.setStatus(ExperimentStatus.PROGRESSING);
@@ -99,6 +106,9 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentTestProcessService.save(experimentTestProcess);
return Result.OK("添加成功！");
}
@@ -113,16 +123,33 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
@RequiresPermissions("database:experiment_test_process:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ExperimentTestProcess experimentTestProcess, HttpServletRequest request) {
experimentTestProcessService.updateById(experimentTestProcess);
ExperimentTestProcess byId = experimentTestProcessService.getById(experimentTestProcess.getId());
String experimentId = byId.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
Experiment experiment = new Experiment();
experiment.setId(experimentId);
experiment.setStatus(ExperimentStatus.PROGRESSING);
experimentService.updateById(experiment);
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(byId.getExperimentId());
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentTestProcessService.updateById(experimentTestProcess);
return Result.OK("编辑成功!");
}
@@ -137,14 +164,29 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
@RequiresPermissions("database:experiment_test_process:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) {
experimentTestProcessService.removeById(id);
ExperimentTestProcess experimentTestProcess = experimentTestProcessService.getById(id);
String experimentId = experimentTestProcess.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(id);
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentTestProcessService.removeById(id);
return Result.OK("删除成功!");
}

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

@@ -16,11 +16,10 @@ import org.jeecg.common.aspect.annotation.AutoLog;
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.dto.ExperimentUserDTO;
import org.jeecg.modules.database.entity.ExperimentLog;
import org.jeecg.modules.database.entity.ExperimentUser;
import org.jeecg.modules.database.service.IExperimentLogService;
import org.jeecg.modules.database.service.IExperimentUserService;
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;
@@ -48,6 +47,9 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
@Autowired
private ISysUserService userService;
@Autowired
private IExperimentService experimentService;
/**
* 分页列表查询
*
@@ -99,6 +101,13 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentUserService.save(experimentUser);
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentUser.getExperimentId());
@@ -115,13 +124,21 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
@RequiresPermissions("database:experiment_user:add")
@PostMapping(value = "/batchAdd")
public Result<String> batchAdd(@RequestBody List<ExperimentUser> experimentUserList, HttpServletRequest request) {
experimentUserList.forEach(v -> {
for (ExperimentUser v : experimentUserList) {
String experimentId = v.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
throw new RuntimeException("试验数据不存在！");
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
experimentUserService.save(v);
});
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentUserList.get(0).getExperimentId());
experimentLog.setLogContent("添加试验人员");
@@ -145,7 +162,18 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
public Result<String> edit(@RequestBody ExperimentUser experimentUser, HttpServletRequest request) {
experimentUserService.updateById(experimentUser);
ExperimentUser byId = experimentUserService.getById(experimentUser.getId());
String experimentId = byId.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(byId.getExperimentId());
experimentLog.setLogContent("编辑试验人员");
@@ -167,15 +195,28 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
@RequiresPermissions("database:experiment_user:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id, HttpServletRequest request) {
experimentUserService.removeById(id);
ExperimentUser experimentUser = experimentUserService.getById(id);
String experimentId = experimentUser.getExperimentId();
if (StringUtils.isBlank(experimentId)) {
return Result.error("试验数据不存在！");
}
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！");
}
if (StringUtils.containsAny(dbExperiment.getStatus(), ExperimentStatus.COMPLETED, ExperimentStatus.REPORT_AUDITING)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(id);
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除试验人员");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
experimentUserService.removeById(id);
return Result.OK("删除成功!");
}
@@ -245,8 +286,6 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
return Result.OK(userDTOList);
}
/**
* 导出excel
*

29
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
View File

@@ -1,19 +1,22 @@
package org.jeecg.modules.database.entity;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.apache.commons.lang3.StringUtils;
import org.jeecg.common.util.DateUtils;
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;
import java.util.*;
/**
* @Description: 试验管理
@@ -170,6 +173,28 @@ public class Experiment implements Serializable {
public Experiment copy() {
Experiment experiment = new Experiment();
BeanUtil.copyProperties(this, experiment);
String irradiationBoard = this.getIrradiationBoard();
//[{"key":"1","sampleModel":"88h21","irradiationBoardNumber":"20","irradiationBoardCode":"293",
// "measurementValidity":"2024-11-09","sourceArea":"20"}]
if (StringUtils.isNotBlank(irradiationBoard)) {
List<JSONObject> boardList = JSON.parseArray(irradiationBoard, JSONObject.class);
boardList.forEach(board -> {
board.put("measurementValidity", null);
board.put("sourceArea", null);
});
experiment.setIrradiationBoard(JSON.toJSONString(boardList));
}
String deviationEquipment = this.getDeviationEquipment();
//[{"key":"1","sampleModel":"88h21","equipmentModel":"siis","offsetCondition":"sjjsj","load":"2024-11-09",
// "equipmentType":"sjjsjsj"}]
if (StringUtils.isNotBlank(deviationEquipment)) {
List<JSONObject> boardList = JSON.parseArray(deviationEquipment, JSONObject.class);
boardList.forEach(board -> {
board.put("load", null);
});
experiment.setDeviationEquipment(JSON.toJSONString(boardList));
}
experiment.setExperimentNo("NO-" + DateUtils.formatDate(new Date(), "yyyyMMddHHmmss"));
experiment.setName(this.name + "-" + getCopyCount());
experiment.setId(null);
experiment.setCopyCount(0);