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/ComponentInfoSeServiceImpl.java | 81 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
index 58c024a..486ed9f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ComponentInfoSeServiceImpl.java
@@ -41,7 +41,7 @@
@Autowired
public ProductInfoMapper productInfoMapper;
@Autowired
- private IPermissionStreamService permissionStreamService;
+ private IPermissionStreamNewService permissionStreamNewService;
@Autowired
private IComponentDepartmentService componentDepartmentService;
@Autowired
@@ -74,8 +74,7 @@
String userId = user.getId();
if(!ValidateUtil.validateString(userId))
ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
-
- List<PermissionStream> oldPermissionList;
+ List<PermissionStreamNew> oldPermissionList;
ProductInfo productInfo = productInfoMapper.selectById(componentInfo.getProductId());
if(productInfo == null)
ExceptionCast.cast(ComponentInfoCode.COMPONENT_PRODUCT_NONE);
@@ -84,10 +83,10 @@
if(en == null) {
ExceptionCast.cast(ComponentInfoCode.COMPONENT_PARENT_NOT_EXIST);
}
- oldPermissionList = permissionStreamService.getByComponentId(en.getProductId(), en.getComponentId());
+ oldPermissionList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(en.getComponentId(),"2","1");
componentInfo.setRankLevel(en.getRankLevel() + 1);
} else {
- oldPermissionList = permissionStreamService.getByProductId(productInfo.getProductId());
+ oldPermissionList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(productInfo.getProductId(),"1","1");
componentInfo.setParentId(null);
componentInfo.setRankLevel(1);
}
@@ -98,17 +97,17 @@
ExceptionCast.cast(CommonCode.FAIL);
//閮ㄩ棬鏉冮檺
List<ComponentDepartment> componentDepartmentList = new ArrayList<>();
- List<PermissionStream> componentDepartPermList = new ArrayList<>();
+ List<PermissionStreamNew> componentDepartPermList = new ArrayList<>();
if(oldPermissionList != null && !oldPermissionList.isEmpty()) {
oldPermissionList.forEach(item -> {
ComponentDepartment componentDepartment = new ComponentDepartment();
componentDepartment.setComponentId(componentInfo.getComponentId());
componentDepartment.setDepartId(item.getDepartId());
componentDepartmentList.add(componentDepartment);
- PermissionStream permissionStream = new PermissionStream();
- permissionStream.setProductId(componentInfo.getProductId());
- permissionStream.setComponentId(componentInfo.getComponentId());
+ PermissionStreamNew permissionStream = new PermissionStreamNew();
+ permissionStream.setBusinessId(componentInfo.getComponentId());
permissionStream.setDepartId(item.getDepartId());
+ permissionStream.setBusinessType("2");
componentDepartPermList.add(permissionStream);
});
}
@@ -118,7 +117,7 @@
ExceptionCast.cast(CommonCode.FAIL);
}
if(!componentDepartPermList.isEmpty()) {
- b = permissionStreamService.saveBatch(componentDepartPermList);
+ b = permissionStreamNewService.saveBatch(componentDepartPermList);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
}
@@ -128,11 +127,11 @@
}
//鍘婚櫎榛樿鏂板宸ュ簭锛岃浆涓烘墜鍔ㄦ坊鍔�
//娣诲姞鏉冮檺
- PermissionStream stream = new PermissionStream();
+ PermissionStreamNew stream = new PermissionStreamNew();
stream.setUserId(userId);
- stream.setProductId(componentInfo.getProductId());
- stream.setComponentId(componentInfo.getComponentId());
- return permissionStreamService.save(stream);
+ stream.setBusinessId(componentInfo.getComponentId());
+ stream.setBusinessType("2");
+ return permissionStreamNewService.save(stream);
}
@Override
@@ -166,13 +165,13 @@
if(!b)
return false;
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndUserId(en.getProductId(), id, userId);
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId,"2");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setUserId(userId);
- stream.setProductId(en.getProductId());
- stream.setComponentId(id);
- return permissionStreamService.save(stream);
+ stream.setBusinessId(id);
+ stream.setBusinessType("2");
+ return permissionStreamNewService.save(stream);
}
return b;
}
@@ -227,10 +226,10 @@
b = componentDepartmentService.deleteByComponentId(item.getComponentId());
if(!b)
ExceptionCast.cast(ComponentInfoCode.COMPONENT_DELETE_PERM_NONE);
- b = permissionStreamService.deleteUserPermsByComponentId(item.getProductId(), item.getComponentId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getComponentId(),"2","0");
if(!b)
ExceptionCast.cast(ComponentInfoCode.COMPONENT_DELETE_PERM_NONE);
- b = permissionStreamService.deleteDepartPermsByComponentId(item.getProductId(), item.getComponentId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getComponentId(),"2","1");
if(!b)
ExceptionCast.cast(ComponentInfoCode.COMPONENT_DELETE_PERM_NONE);
b = super.removeById(item.getComponentId());
@@ -273,10 +272,10 @@
b = componentDepartmentService.deleteByComponentId(id);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = permissionStreamService.deleteUserPermsByComponentId(componentInfo.getProductId(), componentInfo.getComponentId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","0");
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = permissionStreamService.deleteDepartPermsByComponentId(componentInfo.getProductId(), componentInfo.getComponentId());
+ b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","1");
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
return super.removeById(id);
@@ -300,7 +299,7 @@
if(componentInfo == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ComponentPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
ComponentPermission en = componentPermissionService.getByComponentIdAndUserId(componentInfo.getComponentId(), item.getId());
if(en == null) {
@@ -309,12 +308,12 @@
en.setComponentId(componentInfo.getComponentId());
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndUserId(componentInfo.getProductId(), componentInfo.getComponentId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(), "2 ");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setUserId(item.getId());
- stream.setProductId(componentInfo.getProductId());
- stream.setComponentId(componentInfo.getComponentId());
+ stream.setBusinessId(componentInfo.getComponentId());
+ stream.setBusinessType("2");
permissionStreamList.add(stream);
}
});
@@ -325,7 +324,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -339,13 +338,13 @@
if(componentInfo == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ComponentPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
ComponentPermission en = componentPermissionService.getByComponentIdAndUserId(componentInfo.getComponentId(), item.getId());
if(en != null) {
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndUserId(componentInfo.getProductId(), componentInfo.getComponentId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(), "2 ");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -361,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);
}
@@ -375,7 +374,7 @@
if(componentInfo == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ComponentDepartment> componentDepartments = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
ComponentDepartment en = componentDepartmentService.getByComponentIdAndDepartId(componentInfo.getComponentId(), item.getId());
if(en == null) {
@@ -384,12 +383,12 @@
en.setComponentId(componentInfo.getComponentId());
componentDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndDepartId(componentInfo.getProductId(), componentInfo.getComponentId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),"2");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setDepartId(item.getId());
- stream.setProductId(componentInfo.getProductId());
- stream.setComponentId(componentInfo.getComponentId());
+ stream.setBusinessId(componentInfo.getComponentId());
+ stream.setBusinessType("2");
permissionStreamList.add(stream);
}
});
@@ -400,7 +399,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -414,13 +413,13 @@
if(componentInfo == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ComponentDepartment> componentDepartments = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
ComponentDepartment en = componentDepartmentService.getByComponentIdAndDepartId(componentInfo.getComponentId(), item.getId());
if(en != null) {
componentDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndDepartId(componentInfo.getProductId(), componentInfo.getComponentId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),"2");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -432,7 +431,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