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

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

@@ -100,10 +100,15 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentAnnealProcessService.saveWithDetails(experimentAnnealProcess, "add");
@@ -111,8 +116,6 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("添加退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
@@ -139,10 +142,15 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentAnnealProcessService.saveWithDetails(experimentAnnealProcess, "edit");
@@ -150,8 +158,6 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
return Result.OK("编辑成功!");
@@ -177,15 +183,18 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除退火过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);

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

@@ -96,10 +96,15 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
experimentRadiationProcess.setId(null);
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -109,8 +114,6 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("添加辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
@@ -137,10 +140,15 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
experimentRadiationProcessService.saveOrUpdate(experimentRadiationProcess);
@@ -149,8 +157,6 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑辐照过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
@@ -177,15 +183,18 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
ExperimentLog experimentLog = new ExperimentLog();
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);

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);
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
experimentTestProcess.setId(null);
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -107,8 +111,6 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentTestProcess.getExperimentId());
experimentLog.setLogContent("添加测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
@@ -134,10 +136,14 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
experimentService.changeStatus(experimentId, ExperimentStatus.PROGRESSING);
@@ -146,8 +152,6 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("编辑测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);
@@ -174,15 +178,17 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
Experiment dbExperiment = experimentService.getById(experimentId);
if (Objects.isNull(dbExperiment)) {
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)) {
return Result.error("试验状态:[" + dbExperiment.getStatus() + "]不能进行修改！");
}
}
ExperimentLog experimentLog = new ExperimentLog();
experimentLog.setExperimentId(experimentId);
experimentLog.setLogContent("删除测试过程");
String username = JwtUtil.getUserNameByToken(request);
SysUser userByName = userService.getUserByName(username);
experimentLog.setCreateBy(userByName.getRealname());
experimentLogService.save(experimentLog);

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

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