From 757bfa4a2865b3066e82a7e80bea1efd8bdcd72c Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期四, 20 二月 2025 15:03:27 +0800
Subject: [PATCH] 去除原有日志 默认新增管理员权限
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 272 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 232 insertions(+), 40 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 813f313..045fc53 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
@@ -1,17 +1,18 @@
package org.jeecg.modules.dnc.service.impl;
+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;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.ProcessStreamMapper;
-import org.jeecg.modules.dnc.response.CommonCode;
-import org.jeecg.modules.dnc.response.ComponentInfoCode;
-import org.jeecg.modules.dnc.response.DeviceCode;
-import org.jeecg.modules.dnc.response.ProcessInfoCode;
+import org.jeecg.modules.dnc.response.*;
import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.dnc.utils.ValidateUtil;
@@ -19,11 +20,15 @@
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;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -42,7 +47,17 @@
@Lazy
private IDeviceInfoService deviceInfoService;
@Autowired
- private INcLogInfoService iNcLogInfoService;
+ private IPermissionStreamService permissionStreamService;
+ @Autowired
+ private IProcessionDepartmentService processionDepartmentService;
+ @Autowired
+ private IWorkStepService workStepService;
+ @Autowired
+ private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProcessStreamPermissionService processStreamPermissionService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -57,6 +72,10 @@
ExceptionCast.cast(ProcessInfoCode.PROCESS_NAME_NONE);
if(!ValidateUtil.validateString(stream.getProcessCode()))
ExceptionCast.cast(ProcessInfoCode.PROCESS_CODE_NONE);
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ if(!ValidateUtil.validateString(userId))
+ ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
if(ValidateUtil.validateString(stream.getPartsId())) {
PartsInfo partsInfo = partsInfoService.getById(stream.getPartsId());
if(partsInfo == null)
@@ -81,22 +100,24 @@
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());
- return processInfoService.addOrEdit(processInfo);
+ //娣诲姞鐢ㄦ埛鏉冮檺
+ b = productPermissionService.add(stream.getProcessId(), userId,"5");
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
+ //娣诲姞鏉冮檺楠岃瘉
+ PermissionStream permissionStream = new PermissionStream();
+ permissionStream.setUserId(userId);
+ permissionStream.setProductId(stream.getProductId());
+ permissionStream.setComponentId(stream.getComponentId());
+ if (StrUtil.isNotEmpty(stream.getPartsId())){
+ permissionStream.setPartsId(stream.getPartsId());
+ }
+ permissionStream.setProcessId(stream.getProcessId());
+ return permissionStreamService.save(permissionStream);
}
@Override
@@ -115,16 +136,6 @@
stream.setPartsId(null);
stream.setProcessName(stream.getProcessName().toUpperCase());
stream.setProcessCode(null);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(3);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("宸ュ簭鍙凤細"+en.getProcessCode());
- ncLogInfo.setRemark(JSONObject.toJSONString(en));
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
boolean b = super.updateById(stream);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
@@ -142,18 +153,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);
}
@@ -223,4 +232,187 @@
ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
return list;
}
+
+ @Override
+ public List<ProcessStream> getByuserPerms(String userId){
+ if(!ValidateUtil.validateString(userId))
+ return Collections.emptyList();
+ return super.getBaseMapper().getByUserPerms(userId);
+ }
+
+ @Override
+ public List<ProcessStream> getByuserPerms(String userId,String queryParam){
+ if(!ValidateUtil.validateString(userId))
+ return Collections.emptyList();
+ if(!ValidateUtil.validateString(queryParam))
+ return Collections.emptyList();
+ LambdaQueryWrapper<ProcessStream> queryWrapper = Wrappers.lambdaQuery();
+ if(ValidateUtil.validateString(queryParam)) {
+ queryWrapper.and(wrapper->wrapper.like(ProcessStream::getProcessName, queryParam)
+ .or()
+ .like(ProcessStream::getProcessName, queryParam));
+ }
+ queryWrapper.orderByAsc(ProcessStream::getCreateTime);
+ return super.list(queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean assignAddDepart(ProcessStream processStream, Collection<MdcProduction> departmentList) {
+ if(processStream == null || departmentList == null || departmentList.isEmpty())
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ List<ProcessionDepartment> processionDepartmentList = new ArrayList<>();
+ List<PermissionStream> permissionStreamList = new ArrayList<>();
+ departmentList.forEach(item -> {
+ ProcessionDepartment en = processionDepartmentService.getByProcessIdAndDepartId(processStream.getProcessId(), item.getId());
+ if(en == null) {
+ en = new ProcessionDepartment();
+ en.setDepartId(item.getId());
+ en.setProcessId(processStream.getProcessId());
+ processionDepartmentList.add(en);
+ }
+ PermissionStream stream = permissionStreamService.getByProcessIdAndDepartId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId(),processStream.getProcessId(),item.getId());
+ if(stream == null) {
+ stream = new PermissionStream();
+ stream.setDepartId(item.getId());
+ stream.setProductId(processStream.getProductId());
+ stream.setComponentId(processStream.getComponentId());
+ stream.setPartsId(processStream.getPartsId());
+ stream.setProcessId(processStream.getProcessId());
+ permissionStreamList.add(stream);
+ }
+ });
+ if(!processionDepartmentList.isEmpty()) {
+ boolean b = processionDepartmentService.saveBatch(processionDepartmentList);
+ 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
+ public List<ProcessStream> getByComponentIdList(String productId, List<String> componentIds, List<String> partsIds) {
+ return super.baseMapper.findByPartsAndComponents(productId,componentIds,partsIds);
+ }
+
+
+ /**
+ * 鍒嗛厤閮ㄩ棬鏉冮檺
+ * @param processStream
+ * @param departmentList
+ * @return
+ */
+ @Override
+ public boolean assignRemoveDepart(ProcessStream processStream, Collection<MdcProduction> departmentList){
+ if(processStream == null || departmentList == null || departmentList.isEmpty())
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ List<ProcessionDepartment> processionDepartmentList = new ArrayList<>();
+ List<PermissionStream> permissionStreamList = new ArrayList<>();
+ departmentList.forEach(item -> {
+ ProcessionDepartment en = processionDepartmentService.getByProcessIdAndDepartId(processStream.getProcessId(), item.getId());
+ if(en != null) {
+ processionDepartmentList.add(en);
+ }
+ PermissionStream stream = permissionStreamService.getByProcessIdAndDepartId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId()
+ ,processStream.getProcessId(), item.getId());
+ if(stream != null) {
+ permissionStreamList.add(stream);
+ }
+ });
+ if(!processionDepartmentList.isEmpty()) {
+ boolean b = processionDepartmentService.removeByCollection(processionDepartmentList);
+ 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;
+ }
+
+ @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