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
2025-12-01 14:46:58 +08:00
parent c4ffd9c0fc
commit 5360e0da9e
4 changed files with 99 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,12 +45,12 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
private ISysUserService userService; private ISysUserService userService;
@Autowired @Autowired
private IExperimentService experimentService; private IExperimentService experimentService;
@Autowired @Autowired
private IExperimentLogService experimentLogService; private IExperimentLogService experimentLogService;
@Autowired @Autowired
private IExperimentSampleInfoService experimentSampleInfoService; private IExperimentSampleInfoService experimentSampleInfoService;
@Autowired @Autowired
private IExperimentDeviationConditionService experimentDeviationConditionService; private IExperimentDeviationConditionService experimentDeviationConditionService;
@Autowired @Autowired
@@ -100,19 +100,22 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(), String username = JwtUtil.getUserNameByToken(request);
ExperimentStatus.REVIEWED)) { SysUser userByName = userService.getUserByName(username);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(),
ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING); experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentAnnealProcessService.saveWithDetails(experimentAnnealProcess,"add"); experimentAnnealProcessService.saveWithDetails(experimentAnnealProcess, "add");
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("添加退火过程"); experimentLog.setLogContent("添加退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
@@ -139,19 +142,22 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(), String username = JwtUtil.getUserNameByToken(request);
ExperimentStatus.REVIEWED)) { SysUser userByName = userService.getUserByName(username);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(),
ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING); experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentAnnealProcessService.saveWithDetails(experimentAnnealProcess,"edit"); experimentAnnealProcessService.saveWithDetails(experimentAnnealProcess, "edit");
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑退火过程"); experimentLog.setLogContent("编辑退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
@@ -177,15 +183,18 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(), String username = JwtUtil.getUserNameByToken(request);
ExperimentStatus.REVIEWED)) { SysUser userByName = userService.getUserByName(username);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(),
ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除退火过程"); experimentLog.setLogContent("删除退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);

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

@@ -45,7 +45,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
@Autowired @Autowired
private IExperimentLogService experimentLogService; private IExperimentLogService experimentLogService;
@Autowired @Autowired
private ISysUserService userService; private ISysUserService userService;
@Autowired @Autowired
private IExperimentService experimentService; private IExperimentService experimentService;
@@ -96,9 +96,14 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(), String username = JwtUtil.getUserNameByToken(request);
ExperimentStatus.REVIEWED)) { SysUser userByName = userService.getUserByName(username);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(),
ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
experimentRadiationProcess.setId(null); experimentRadiationProcess.setId(null);
@@ -109,8 +114,6 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("添加辐照过程"); experimentLog.setLogContent("添加辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
@@ -137,9 +140,14 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(), String username = JwtUtil.getUserNameByToken(request);
ExperimentStatus.REVIEWED)) { SysUser userByName = userService.getUserByName(username);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(),
ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING); experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentRadiationProcessService.saveOrUpdate(experimentRadiationProcess); experimentRadiationProcessService.saveOrUpdate(experimentRadiationProcess);
@@ -149,8 +157,6 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑辐照过程"); experimentLog.setLogContent("编辑辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
@@ -177,15 +183,18 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(), String username = JwtUtil.getUserNameByToken(request);
ExperimentStatus.REVIEWED)) { SysUser userByName = userService.getUserByName(username);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED) || StringUtils.equals(dbExperiment.getStatus(),
ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除辐照过程"); experimentLog.setLogContent("删除辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
experimentRadiationProcessService.removeById(id); experimentRadiationProcessService.removeById(id);

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

@@ -94,10 +94,14 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
Experiment dbExperiment = experimentService.getById(experimentId); Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
// 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)||StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.REVIEWED)) { if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)||StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
} }
}
experimentTestProcess.setId(null); experimentTestProcess.setId(null);
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING); experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -107,8 +111,6 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentTestProcess.getExperimentId()); experimentLog.setExperimentId(experimentTestProcess.getExperimentId());
experimentLog.setLogContent("添加测试过程"); experimentLog.setLogContent("添加测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
@@ -134,10 +136,14 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
Experiment dbExperiment = experimentService.getById(experimentId); Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
// 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)||StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.REVIEWED)) { if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)||StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
} }
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING); experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -146,8 +152,6 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑测试过程"); experimentLog.setLogContent("编辑测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
@@ -174,15 +178,17 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
Experiment dbExperiment = experimentService.getById(experimentId); Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
// 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)||StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.REVIEWED)) { if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)||StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.REVIEWED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
} }
}
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除测试过程"); experimentLog.setLogContent("删除测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);

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

@@ -44,7 +44,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
@Autowired @Autowired
private IExperimentLogService experimentLogService; private IExperimentLogService experimentLogService;
@Autowired @Autowired
private ISysUserService userService; private ISysUserService userService;
@Autowired @Autowired
private IExperimentService experimentService; private IExperimentService experimentService;
@@ -91,15 +91,18 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) { String username = JwtUtil.getUserNameByToken(request);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); SysUser userByName = userService.getUserByName(username);
// 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
experimentUserService.save(experimentUser); experimentUserService.save(experimentUser);
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentUser.getExperimentId()); experimentLog.setExperimentId(experimentUser.getExperimentId());
experimentLog.setLogContent("添加试验人员"); experimentLog.setLogContent("添加试验人员");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
@@ -110,6 +113,9 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
@RequiresPermissions("database:experiment_user:add") @RequiresPermissions("database:experiment_user:add")
@PostMapping(value = "/batchAdd") @PostMapping(value = "/batchAdd")
public Result<String> batchAdd(@RequestBody List<ExperimentUser> experimentUserList, HttpServletRequest request) { public Result<String> batchAdd(@RequestBody List<ExperimentUser> experimentUserList, HttpServletRequest request) {
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
for (ExperimentUser v : experimentUserList) { for (ExperimentUser v : experimentUserList) {
String experimentId = v.getExperimentId(); String experimentId = v.getExperimentId();
if (StringUtils.isBlank(experimentId)) { if (StringUtils.isBlank(experimentId)) {
@@ -120,16 +126,18 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); // 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
experimentUserService.save(v); experimentUserService.save(v);
} }
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentUserList.get(0).getExperimentId()); experimentLog.setExperimentId(experimentUserList.get(0).getExperimentId());
experimentLog.setLogContent("添加试验人员"); experimentLog.setLogContent("添加试验人员");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
@@ -157,14 +165,17 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) { String username = JwtUtil.getUserNameByToken(request);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); SysUser userByName = userService.getUserByName(username);
// 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(byId.getExperimentId()); experimentLog.setExperimentId(byId.getExperimentId());
experimentLog.setLogContent("编辑试验人员"); experimentLog.setLogContent("编辑试验人员");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
@@ -191,14 +202,17 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
if (Objects.isNull(dbExperiment)) { if (Objects.isNull(dbExperiment)) {
return Result.error("试验数据不存在！"); return Result.error("试验数据不存在！");
} }
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) { String username = JwtUtil.getUserNameByToken(request);
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！"); SysUser userByName = userService.getUserByName(username);
// 超级管理不用判断状态和修改状态，只修改数据。 20250511 邓春
if (!"admin".equals(userByName.getUsername())) {
if (StringUtils.equals(dbExperiment.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
} }
ExperimentLog experimentLog = new ExperimentLog(); ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId); experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除试验人员"); experimentLog.setLogContent("删除试验人员");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname()); experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog); experimentLogService.save(experimentLog);
experimentUserService.removeById(id); experimentUserService.removeById(id);