From c06fab29ca7826a6dc9736c1ba8ce1e26a11c829 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 06 三月 2025 15:57:08 +0800
Subject: [PATCH] 新增层级结构工艺规程版本、结构树表、新权限表 修改原有权限验证 删除原有代码
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
index cdbe6cf..d4dd1eb 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/WorkStepServiceImpl.java
@@ -39,9 +39,8 @@
*/
@Service
public class WorkStepServiceImpl extends ServiceImpl<WorkStepMapper, WorkStep> implements IWorkStepService {
-
@Autowired
- private IPermissionStreamService permissionStreamService;
+ private IPermissionStreamNewService permissionStreamNewService;
@Autowired
private IWorkStepDepartmentService workStepDepartmentService;
@@ -112,23 +111,43 @@
boolean b =super.save(workStep);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞鐢ㄦ埛鏉冮檺
+ //娣诲姞閮ㄩ棬鏉冮檺
+ List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(workStep.getProcessId(),"5","1");
+ if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
+ List<WorkStepDepartment> workStepDepartmentList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
+ oldDepartPermList.forEach(item -> {
+ WorkStepDepartment pd = new WorkStepDepartment();
+ pd.setDepartId(item.getDepartId());
+ pd.setStepId(workStep.getId());
+ workStepDepartmentList.add(pd);
+ PermissionStreamNew perm = new PermissionStreamNew();
+ perm.setBusinessId(workStep.getId());
+ perm.setBusinessType("6");
+ permissionStreamList.add(perm);
+ });
+ if(!workStepDepartmentList.isEmpty()) {
+ b = workStepDepartmentService.saveBatch(workStepDepartmentList);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
+ }
+ if(!permissionStreamList.isEmpty()) {
+ b = permissionStreamNewService.saveBatch(permissionStreamList);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
+ }
+ }
//娣诲姞鐢ㄦ埛鏉冮檺
b = productPermissionService.add(workStep.getId(), userId,"6");
if (!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
}
//娣诲姞鏉冮檺楠岃瘉
- PermissionStream permissionStream = new PermissionStream();
+ PermissionStreamNew permissionStream = new PermissionStreamNew();
permissionStream.setUserId(userId);
- permissionStream.setProductId(workStep.getProductId());
- permissionStream.setComponentId(workStep.getComponentId());
- if (StrUtil.isNotEmpty(workStep.getPartsId())){
- permissionStream.setPartsId(workStep.getPartsId());
- }
- permissionStream.setProcessId(workStep.getProcessId());
- permissionStream.setStepId(workStep.getId());
- return permissionStreamService.save(permissionStream);
+ permissionStream.setBusinessId(workStep.getId());
+ permissionStream.setBusinessType("6");
+ return permissionStreamNewService.save(permissionStream);
}
/**
@@ -146,13 +165,6 @@
WorkStep en = super.getById(id);
if(en == null)
ExceptionCast.cast(ProcessInfoCode.WORKSTEP_NOT_EXIST);
-// workStep.setStepId(id);
-// workStep.setProductId(null);
-// workStep.setComponentId(null);
-// workStep.setPartsId(null);
-// workStep.setProcessId(null);
-// workStep.setStepName(workStep.getStepName().toUpperCase());
-// workStep.setStepCode(null);
return super.updateById(workStep);
}
@@ -174,7 +186,7 @@
if(workStep == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<WorkStepDepartment> workStepDepartmentList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
WorkStepDepartment en = workStepDepartmentService.getByStepIdAndDepartId(workStep.getId(), item.getId());
if(en == null) {
@@ -183,16 +195,12 @@
en.setStepId(workStep.getId());
workStepDepartmentList.add(en);
}
- PermissionStream stream = permissionStreamService.getByStepIdAndDepartId(workStep.getProductId(), workStep.getComponentId(), workStep.getPartsId(),workStep.getProcessId(),workStep.getId(),item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(workStep.getId(),item.getId(),"6");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setDepartId(item.getId());
- stream.setProductId(workStep.getProductId());
- stream.setComponentId(workStep.getComponentId());
- stream.setPartsId(workStep.getPartsId());
- stream.setProcessId(workStep.getProcessId());
- stream.setStepId(workStep.getId());
-
+ stream.setBusinessId(workStep.getId());
+ stream.setBusinessType("6");
permissionStreamList.add(stream);
}
});
@@ -203,7 +211,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -243,14 +251,13 @@
if(workStep == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<WorkStepDepartment> workStepDepartmentList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
WorkStepDepartment en = workStepDepartmentService.getByStepIdAndDepartId(workStep.getId(), item.getId());
if(en != null) {
workStepDepartmentList.add(en);
}
- PermissionStream stream = permissionStreamService.getByStepIdAndDepartId(workStep.getProductId(), workStep.getComponentId(), workStep.getPartsId()
- ,workStep.getProcessId(),workStep.getId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(workStep.getId(),item.getId(),"6");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -262,7 +269,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+ boolean b = permissionStreamNewService.deletePermissionStreamNewByList(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -295,7 +302,7 @@
if(workStep == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<WorkStepPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
WorkStepPermission en = workStepPermissionService.getByStepIdAndUserId(workStep.getId(), item.getId());
if(en == null) {
@@ -304,16 +311,12 @@
en.setStepId(workStep.getId());
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByStepIdAndUserId(workStep.getProductId(), workStep.getComponentId(), workStep.getPartsId()
- ,workStep.getProcessId(),workStep.getId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),item.getId(),"6");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setUserId(item.getId());
- stream.setProductId(workStep.getProductId());
- stream.setComponentId(workStep.getComponentId());
- stream.setPartsId(workStep.getPartsId());
- stream.setProcessId(workStep.getProcessId());
- stream.setStepId(workStep.getId());
+ stream.setBusinessId(workStep.getId());
+ stream.setBusinessType("6");
permissionStreamList.add(stream);
}
});
@@ -324,7 +327,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -338,14 +341,13 @@
if(workStep == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<WorkStepPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
WorkStepPermission en = workStepPermissionService.getByStepIdAndUserId(workStep.getId(), item.getId());
if(en != null) {
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByStepIdAndUserId(workStep.getProductId(), workStep.getComponentId(),
- workStep.getPartsId(),workStep.getProcessId(), workStep.getId(),item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),item.getId(),"6");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -358,7 +360,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+ boolean b = permissionStreamNewService.deletePermissionStreamNewByList(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
--
Gitblit v1.9.3