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 | 165 ++++++++++++++++++++----------------------------------
1 files changed, 62 insertions(+), 103 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 3856ff5..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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
@@ -20,6 +21,7 @@
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.entity.*;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.dnc.entity.ComponentInfo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +41,7 @@
@Autowired
public ProductInfoMapper productInfoMapper;
@Autowired
- private IPermissionStreamService permissionStreamService;
+ private IPermissionStreamNewService permissionStreamNewService;
@Autowired
private IComponentDepartmentService componentDepartmentService;
@Autowired
@@ -50,7 +52,9 @@
@Autowired
private IDocInfoService docInfoService;
@Autowired
- private INcLogInfoService iNcLogInfoService;
+ private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -70,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);
@@ -80,40 +83,31 @@
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);
}
componentInfo.setComponentStatus(1);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("閮ㄤ欢鍚嶇О锛�"+componentInfo.getComponentName()+"锛岄儴浠朵唬鍙凤細"+componentInfo.getComponentCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.save(componentInfo);
if(!b)
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);
});
}
@@ -123,39 +117,21 @@
ExceptionCast.cast(CommonCode.FAIL);
}
if(!componentDepartPermList.isEmpty()) {
- b = permissionStreamService.saveBatch(componentDepartPermList);
+ b = permissionStreamNewService.saveBatch(componentDepartPermList);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
}
- ComponentPermission permission = new ComponentPermission();
- permission.setComponentId(componentInfo.getComponentId());
- permission.setUserId(userId);
- b = componentPermissionService.save(permission);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞榛樿宸ュ簭
- ProcessStream processStream = new ProcessStream();
- processStream.setProductId(componentInfo.getProductId());
- processStream.setComponentId(componentInfo.getComponentId());
- processStream.setProcessCode("1");
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfogx = new NcLogInfo();
- //妯″潡
- ncLogInfogx.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfogx.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfogx.setLogContent("閮ㄤ欢鍚嶇О锛�"+componentInfo.getComponentName()+"鐢熸垚榛樿宸ュ簭锛屽伐搴忓彿锛�"+processStream.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfogx);
- b = processStreamService.save(processStream);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
+ b = productPermissionService.add(componentInfo.getComponentId(), userId,"2");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
+ //鍘婚櫎榛樿鏂板宸ュ簭锛岃浆涓烘墜鍔ㄦ坊鍔�
//娣诲姞鏉冮檺
- 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
@@ -177,17 +153,6 @@
componentInfo.setComponentStatus(null);
componentInfo.setRankLevel(null);
componentInfo.setProductId(null);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(3);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("淇敼閮ㄤ欢鍚嶇О锛�"+productInfoMapper.selectById(en.getProductId()).getProductName()+"瀛愰泦閮ㄤ欢");
- //淇敼淇濆瓨澶囨敞
- ncLogInfo.setRemark(JSONObject.toJSONString(en));
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.updateById(componentInfo);
if(!b)
return false;
@@ -200,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;
}
@@ -261,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());
@@ -295,28 +260,22 @@
if(processStreamList != null && !processStreamList.isEmpty()) {
ExceptionCast.cast(ComponentInfoCode.COMPONENT_PROCESS_EXIST);
}
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(4);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("閮ㄤ欢鍚嶇О锛�"+componentInfo.getComponentName());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
- boolean b = docInfoService.deleteByComponentId(id);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
+ boolean b;
+ //楠岃瘉鏄惁瀛樺湪鏂囨。
+ List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","2").eq("attribution_id",id));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(ComponentInfoCode.COMPONENT_DOC_EXIST);
+ }
b = componentPermissionService.deleteByComponentId(id);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
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);
@@ -340,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) {
@@ -349,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);
}
});
@@ -365,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);
}
@@ -379,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);
}
@@ -401,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);
}
@@ -411,25 +370,25 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean assignAddDepart(ComponentInfo componentInfo, Collection<Department> departmentList) {
+ public boolean assignAddDepart(ComponentInfo componentInfo, Collection<MdcProduction> departmentList) {
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.getDepartId());
+ ComponentDepartment en = componentDepartmentService.getByComponentIdAndDepartId(componentInfo.getComponentId(), item.getId());
if(en == null) {
en = new ComponentDepartment();
- en.setDepartId(item.getDepartId());
+ en.setDepartId(item.getId());
en.setComponentId(componentInfo.getComponentId());
componentDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndDepartId(componentInfo.getProductId(), componentInfo.getComponentId(), item.getDepartId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),"2");
if(stream == null) {
- stream = new PermissionStream();
- stream.setDepartId(item.getDepartId());
- stream.setProductId(componentInfo.getProductId());
- stream.setComponentId(componentInfo.getComponentId());
+ stream = new PermissionStreamNew();
+ stream.setDepartId(item.getId());
+ stream.setBusinessId(componentInfo.getComponentId());
+ stream.setBusinessType("2");
permissionStreamList.add(stream);
}
});
@@ -440,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);
}
@@ -450,17 +409,17 @@
@Override
@Transactional(rollbackFor = {Exception.class})
- public boolean assignRemoveDepart(ComponentInfo componentInfo, Collection<Department> departmentList) {
+ public boolean assignRemoveDepart(ComponentInfo componentInfo, Collection<MdcProduction> departmentList) {
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.getDepartId());
+ ComponentDepartment en = componentDepartmentService.getByComponentIdAndDepartId(componentInfo.getComponentId(), item.getId());
if(en != null) {
componentDepartments.add(en);
}
- PermissionStream stream = permissionStreamService.getByComponentIdAndDepartId(componentInfo.getProductId(), componentInfo.getComponentId(), item.getDepartId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),"2");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -472,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