From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 89 insertions(+), 60 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 045fc53..b5e0bb4 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,25 +1,19 @@
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.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.ProcessStreamMapper;
+import org.jeecg.modules.dnc.request.ProcessStreamRequest;
import org.jeecg.modules.dnc.response.*;
-
import org.jeecg.modules.dnc.service.*;
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;
@@ -27,10 +21,7 @@
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;
+import java.util.*;
@Service
public class ProcessStreamServiceImpl extends ServiceImpl<ProcessStreamMapper, ProcessStream> implements IProcessStreamService {
@@ -40,14 +31,12 @@
@Autowired
private IProcessInfoService processInfoService;
@Autowired
- private IPartsInfoService partsInfoService;
- @Autowired
- private IDocInfoService docInfoService;
+ private IProcessSpecVersionService processSpecVersionService;
@Autowired
@Lazy
private IDeviceInfoService deviceInfoService;
@Autowired
- private IPermissionStreamService permissionStreamService;
+ private IPermissionStreamNewService permissionStreamNewService;
@Autowired
private IProcessionDepartmentService processionDepartmentService;
@Autowired
@@ -57,11 +46,14 @@
@Autowired
private IProcessStreamPermissionService processStreamPermissionService;
@Autowired
+ private IProductMixService productMixService;
+ @Autowired
private IProductPermissionService productPermissionService;
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addProcessStream(ProcessStream stream) {
+ List<PermissionStreamNew> oldDepartPermList=new ArrayList<>();
if(stream == null)
ExceptionCast.cast(CommonCode.INVALID_PARAM);
if(!ValidateUtil.validateString(stream.getProductId()))
@@ -76,18 +68,19 @@
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)
- ExceptionCast.cast(ProcessInfoCode.PROCESS_PARTS_NONE);
- if(!stream.getProductId().equals(partsInfo.getProductId()))
+ if(ValidateUtil.validateString(stream.getPsvId())) {
+ ProcessSpecVersion psv = processSpecVersionService.getById(stream.getPsvId());
+ if(psv == null)
+ ExceptionCast.cast(ProcessInfoCode.PROCESSSPECVERSION_NONE);
+ if(!stream.getProductId().equals(psv.getProductId()))
ExceptionCast.cast(ProcessInfoCode.PROCESS_PRODUCT_NONE);
- if(!stream.getComponentId().equals(partsInfo.getComponentId()))
+ if(!stream.getComponentId().equals(psv.getComponentId()))
ExceptionCast.cast(ProcessInfoCode.PROCESS_COMPONENT_NONE);
- ProcessStream en = findByProcessNoAndPartsId(stream.getProcessCode(), partsInfo.getPartsId());
+ ProcessStream en = findByProcessNoAndPartsId(stream.getProcessCode(), psv.getId());
if(en != null) {
ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
}
+ oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(psv.getId(),"4","1");
}else {
ComponentInfo componentInfo = componentInfoService.getById(stream.getComponentId());
if(componentInfo == null)
@@ -99,25 +92,58 @@
if(en != null) {
ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
}
+ oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","1");
}
boolean b = super.save(stream);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
+ //娣诲姞閮ㄩ棬鏉冮檺
+ if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
+ List<ProcessionDepartment> processionDepartmentList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
+ oldDepartPermList.forEach(item -> {
+ ProcessionDepartment pd = new ProcessionDepartment();
+ pd.setDepartId(item.getDepartId());
+ pd.setProcessId(stream.getProcessId());
+ processionDepartmentList.add(pd);
+ PermissionStreamNew perm = new PermissionStreamNew();
+ perm.setDepartId(item.getDepartId());
+ perm.setBusinessId(stream.getProcessId());
+ perm.setBusinessType("5");
+ permissionStreamList.add(perm);
+ });
+ if(!processionDepartmentList.isEmpty()) {
+ b = processionDepartmentService.saveBatch(processionDepartmentList);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
+ }
+ if(!permissionStreamList.isEmpty()) {
+ b = permissionStreamNewService.saveBatch(permissionStreamList);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
+ }
+ }
//娣诲姞鐢ㄦ埛鏉冮檺
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());
+ //娣诲姞缁撴瀯鏍�
+ ProductMix productMix;
+ if (stream.getPsvId() != null) {
+ productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getPsvId())
+ ,stream.getProcessName(),stream.getProcessCode(),5,new Date());
+ }else {
+ productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getComponentId())
+ ,stream.getProcessName(),stream.getProcessCode(),5,new Date());
}
- permissionStream.setProcessId(stream.getProcessId());
- return permissionStreamService.save(permissionStream);
+ productMixService.save(productMix);
+ //娣诲姞鏉冮檺楠岃瘉
+ PermissionStreamNew permissionStream = new PermissionStreamNew();
+ permissionStream.setUserId(userId);
+ permissionStream.setBusinessId(stream.getProcessId());
+ permissionStream.setBusinessType("5");
+ return permissionStreamNewService.addPermissionStreamNew(permissionStream);
}
@Override
@@ -135,8 +161,13 @@
stream.setComponentId(null);
stream.setPartsId(null);
stream.setProcessName(stream.getProcessName().toUpperCase());
- stream.setProcessCode(null);
+ stream.setProcessCode(stream.getProcessCode().toUpperCase());
boolean b = super.updateById(stream);
+ //鍚屾淇敼缁撴瀯鏍�
+ ProductMix productMix = productMixService.getById(Long.parseLong(id));
+ productMix.setName(stream.getProcessName());
+ productMix.setCode(stream.getProcessCode());
+ productMixService.updateById(productMix);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
ProcessInfo processInfo = new ProcessInfo();
@@ -163,6 +194,9 @@
if (!docRelativeList.isEmpty()){
ExceptionCast.cast(ProcessInfoCode.PROCESS_HAS_DOC);
}
+ boolean b = productMixService.removeById(id);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
return super.removeById(id);
}
@@ -190,13 +224,13 @@
}
@Override
- public List<ProcessStream> findByPartsId(String partsId) {
- return super.lambdaQuery().eq(ProcessStream::getPartsId, partsId).list();
+ public List<ProcessStream> findBypsvId(String psvId) {
+ return super.lambdaQuery().eq(ProcessStream::getPsvId, psvId).list();
}
@Override
- public ProcessStream findByProcessNoAndPartsId(String processNo, String partsId) {
- List<ProcessStream> list = super.lambdaQuery().eq(ProcessStream::getPartsId, partsId).eq(ProcessStream::getProcessCode, processNo).list();
+ public ProcessStream findByProcessNoAndPartsId(String processNo, String psvsId) {
+ List<ProcessStream> list = super.lambdaQuery().eq(ProcessStream::getPsvId, psvsId).eq(ProcessStream::getProcessCode, processNo).list();
if(list == null || list.isEmpty())
return null;
return list.get(0);
@@ -262,7 +296,7 @@
if(processStream == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ProcessionDepartment> processionDepartmentList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
departmentList.forEach(item -> {
ProcessionDepartment en = processionDepartmentService.getByProcessIdAndDepartId(processStream.getProcessId(), item.getId());
if(en == null) {
@@ -271,14 +305,12 @@
en.setProcessId(processStream.getProcessId());
processionDepartmentList.add(en);
}
- PermissionStream stream = permissionStreamService.getByProcessIdAndDepartId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId(),processStream.getProcessId(),item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),"5");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setDepartId(item.getId());
- stream.setProductId(processStream.getProductId());
- stream.setComponentId(processStream.getComponentId());
- stream.setPartsId(processStream.getPartsId());
- stream.setProcessId(processStream.getProcessId());
+ stream.setBusinessId(processStream.getProcessId());
+ stream.setBusinessType("5");
permissionStreamList.add(stream);
}
});
@@ -289,7 +321,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -314,14 +346,13 @@
if(processStream == null || departmentList == null || departmentList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ProcessionDepartment> processionDepartmentList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> 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());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),"5");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -333,7 +364,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.removeByCollection(permissionStreamList);
+ boolean b = permissionStreamNewService.deletePermissionStreamNewByList(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -347,7 +378,7 @@
if(processStream == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ProcessionPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
userList.forEach(item -> {
ProcessionPermission en = processStreamPermissionService.getByProcessIdAndUserId(processStream.getProcessId(), item.getId());
if(en == null) {
@@ -356,14 +387,12 @@
en.setProcessId(processStream.getProcessId());
permissionList.add(en);
}
- PermissionStream stream = permissionStreamService.getByProcessIdAndUserId(processStream.getProductId(), processStream.getComponentId(), processStream.getPartsId(),processStream.getProcessId(), item.getId());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),"5");
if(stream == null) {
- stream = new PermissionStream();
+ stream = new PermissionStreamNew();
stream.setUserId(item.getId());
- stream.setProductId(processStream.getProductId());
- stream.setComponentId(processStream.getComponentId());
- stream.setPartsId(processStream.getPartsId());
- stream.setProcessId(processStream.getProcessId());
+ stream.setBusinessId(processStream.getProcessId());
+ stream.setBusinessType("5");
permissionStreamList.add(stream);
}
});
@@ -374,7 +403,7 @@
}
}
if(!permissionStreamList.isEmpty()) {
- boolean b = permissionStreamService.saveBatch(permissionStreamList);
+ boolean b = permissionStreamNewService.saveBatch(permissionStreamList);
if(!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
}
@@ -388,13 +417,13 @@
if(processStream == null || userList == null || userList.isEmpty())
ExceptionCast.cast(CommonCode.INVALID_PARAM);
List<ProcessionPermission> permissionList = new ArrayList<>();
- List<PermissionStream> permissionStreamList = new ArrayList<>();
+ List<PermissionStreamNew> 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());
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),"5");
if(stream != null) {
permissionStreamList.add(stream);
}
@@ -407,7 +436,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