From 3302ff7054d02f6b21452f2f2cd3658c8cad6b53 Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期四, 20 二月 2025 10:36:23 +0800
Subject: [PATCH] 增加工序工步用户权限
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 125 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 28 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index 6462d98..f266d1a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.StrUtil;
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.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,13 +15,13 @@
import org.jeecg.modules.dnc.response.*;
import org.jeecg.modules.dnc.service.*;
-import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.request.ProcessStreamRequest;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.system.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -51,6 +52,12 @@
private IPermissionStreamService permissionStreamService;
@Autowired
private IProcessionDepartmentService processionDepartmentService;
+ @Autowired
+ private IWorkStepService workStepService;
+ @Autowired
+ private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProcessStreamPermissionService processStreamPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -93,24 +100,14 @@
ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
}
}
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(2);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("宸ュ簭鍚嶇О锛�"+stream.getProcessName()+"锛屽伐搴忓彿锛�"+stream.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.save(stream);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
-// ProcessInfo processInfo = new ProcessInfo();
-// processInfo.setProcessName(stream.getProcessName());
-// processInfo.setDescription(stream.getDescription());
-// boolean processInfoB= processInfoService.addOrEdit(processInfo);
-// if(!processInfoB)
-// ExceptionCast.cast(CommonCode.FAIL);
+ //娣诲姞鐢ㄦ埛鏉冮檺
+ ProcessionPermission permission = new ProcessionPermission();
+ permission.setProcessId(stream.getProcessId());
+ permission.setUserId(userId);
+ processStreamPermissionService.save(permission);
//娣诲姞鏉冮檺楠岃瘉
PermissionStream permissionStream = new PermissionStream();
permissionStream.setUserId(userId);
@@ -166,18 +163,16 @@
ProcessStream en = super.getById(id);
if(en == null)
ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
- boolean b = docInfoService.deleteByProcessId(en.getProcessId());
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(4);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("宸ュ簭鍙凤細"+en.getProcessCode());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
+ //楠岃瘉宸ュ簭涓嬫槸鍚︽湁宸ユ
+ List<WorkStep> workStepList=workStepService.list(new QueryWrapper<WorkStep>().eq("process_id",id));
+ if(workStepList != null && !workStepList.isEmpty()) {
+ ExceptionCast.cast(ProcessInfoCode.WORKSTEP_HAS_DATA);
+ }
+ //楠岃瘉鏄惁瀛樺湪鏂囨。
+ List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","5").eq("attribution_id",id));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_HAS_DOC);
+ }
return super.removeById(id);
}
@@ -356,4 +351,78 @@
return true;
}
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean assignAddUser(ProcessStream processStream, Collection<SysUser> userList) {
+ if(processStream == null || userList == null || userList.isEmpty())
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ List<ProcessionPermission> permissionList = new ArrayList<>();
+ List<PermissionStream> permissionStreamList = new ArrayList<>();
+ userList.forEach(item -> {
+ ProcessionPermission en = processStreamPermissionService.getByProcessIdAndUserId(processStream.getProcessId(), item.getId());
+ if(en == null) {
+ en = new ProcessionPermission();
+ en.setUserId(item.getId());
+ en.setProcessId(processStream.getProcessId());
+ permissionList.add(en);
+ }
+ PermissionStream stream = permissionStreamService.getByProcessIdAndUserId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId(),processStream.getProcessId(), item.getId());
+ if(stream == null) {
+ stream = new PermissionStream();
+ stream.setUserId(item.getId());
+ stream.setProductId(processStream.getProductId());
+ stream.setComponentId(processStream.getComponentId());
+ stream.setPartsId(processStream.getPartsId());
+ stream.setProcessId(processStream.getProcessId());
+ permissionStreamList.add(stream);
+ }
+ });
+ if(!permissionList.isEmpty()) {
+ boolean b = processStreamPermissionService.saveBatch(permissionList);
+ if(!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+ }
+ }
+ if(!permissionStreamList.isEmpty()) {
+ boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ if(!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+ }
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean assignRemoveUser(ProcessStream processStream, Collection<SysUser> userList) {
+ if(processStream == null || userList == null || userList.isEmpty())
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ List<ProcessionPermission> permissionList = new ArrayList<>();
+ List<PermissionStream> permissionStreamList = new ArrayList<>();
+ userList.forEach(item -> {
+ ProcessionPermission en = processStreamPermissionService.getByProcessIdAndUserId(processStream.getProcessId(), item.getId());
+ if(en != null) {
+ permissionList.add(en);
+ }
+ PermissionStream stream = permissionStreamService.getByProcessIdAndUserId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId(),processStream.getProcessId(), item.getId());
+ if(stream != null) {
+ permissionStreamList.add(stream);
+ }
+ });
+ //娓呯┖鐢ㄦ埛鏉冮檺鏍￠獙
+ if(!permissionList.isEmpty()) {
+ boolean b = processStreamPermissionService.removeByCollection(permissionList);
+ if(!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+ }
+ }
+ if(!permissionStreamList.isEmpty()) {
+ boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+ if(!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+ }
+ }
+ return true;
+ }
+
}
--
Gitblit v1.9.3