From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 567 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 567 insertions(+), 0 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
new file mode 100644
index 0000000..c876f4e
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -0,0 +1,567 @@
+package org.jeecg.modules.dnc.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.constant.DocAttributionTypeEnum;
+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.DocInfoQueryRequest;
+import org.jeecg.modules.dnc.request.ProcessStreamRequest;
+import org.jeecg.modules.dnc.request.TreeInfoRequest;
+import org.jeecg.modules.dnc.response.*;
+import org.jeecg.modules.dnc.service.*;
+import org.jeecg.modules.dnc.utils.ValidateUtil;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+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.*;
+import java.util.stream.Collectors;
+
+@Service
+public class ProcessStreamServiceImpl extends ServiceImpl<ProcessStreamMapper, ProcessStream> implements IProcessStreamService {
+ @Autowired
+ @Lazy
+ private IComponentInfoService componentInfoService;
+ @Autowired
+ private IProcessInfoService processInfoService;
+ @Autowired
+ private IProcessSpecVersionService processSpecVersionService;
+ @Autowired
+ private IMdcEquipmentService mdcEquipmentService;
+ @Autowired
+ private IPermissionStreamNewService permissionStreamNewService;
+ @Autowired
+ private IProcessionDepartmentService processionDepartmentService;
+ @Autowired
+ private IWorkStepService workStepService;
+ @Autowired
+ private IDocRelativeService iDocRelativeService;
+ @Autowired
+ private IProcessStreamPermissionService processStreamPermissionService;
+ @Autowired
+ private IProductMixService productMixService;
+ @Autowired
+ private IProductPermissionService productPermissionService;
+ @Autowired
+ @Lazy
+ private IDocInfoService docInfoService;
+ @Autowired
+ private IDeviceTypeService deviceTypeService;
+ @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()))
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_PRODUCT_NONE);
+ if(!ValidateUtil.validateString(stream.getComponentId()))
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_COMPONENT_NONE);
+ if(!ValidateUtil.validateString(stream.getProcessName()))
+ 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.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(psv.getComponentId()))
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_COMPONENT_NONE);
+ ProcessStream en = findByProcessNoAndPartsId(stream.getProcessCode(), psv.getId());
+ if(en != null) {
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
+ }
+ oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(psv.getId(), DocAttributionTypeEnum.OPERATION.getCode().toString(),"1");
+ }else {
+ ComponentInfo componentInfo = componentInfoService.getById(stream.getComponentId());
+ if(componentInfo == null)
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_COMPONENT_NONE);
+ if(!stream.getProductId().equals(componentInfo.getProductId()))
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_PRODUCT_NONE);
+ stream.setPartsId(null);
+ ProcessStream en = findByProcessNoAndComponentId(stream.getProcessCode(), componentInfo.getComponentId());
+ if(en != null) {
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
+ }
+ oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"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(DocAttributionTypeEnum.PROCESS.getCode().toString());
+ 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,DocAttributionTypeEnum.PROCESS.getCode().toString());
+ if (!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
+ }
+ //娣诲姞缁撴瀯鏍�
+ ProductMix productMix;
+ if (stream.getPsvId() != null) {
+ productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getPsvId())
+ ,stream.getProcessName(),stream.getProcessCode(),DocAttributionTypeEnum.PROCESS.getCode(),new Date());
+ }else {
+ productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getComponentId())
+ ,stream.getProcessName(),stream.getProcessCode(),DocAttributionTypeEnum.PROCESS.getCode(),new Date());
+ }
+ productMixService.save(productMix);
+ //娣诲姞鏉冮檺楠岃瘉
+ PermissionStreamNew permissionStream = new PermissionStreamNew();
+ permissionStream.setUserId(userId);
+ permissionStream.setBusinessId(stream.getProcessId());
+ permissionStream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
+ return permissionStreamNewService.addPermissionStreamNew(permissionStream);
+ }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean editProcessStream(String id, ProcessStream stream) {
+ if(!ValidateUtil.validateString(id) || stream == null)
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ if(!ValidateUtil.validateString(stream.getProcessName()))
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_NAME_NONE);
+ ProcessStream en = super.getById(id);
+ if(en == null)
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
+ stream.setProcessId(id);
+ stream.setProductId(null);
+ stream.setComponentId(null);
+ stream.setPartsId(null);
+ stream.setProcessName(stream.getProcessName().toUpperCase());
+ stream.setProcessCode(stream.getProcessCode().toUpperCase());
+ boolean b = super.updateById(stream);
+ //鍚屾淇敼缁撴瀯鏍�
+ ProductMix productMix = productMixService.getById(Long.parseLong(id));
+ productMix.setTreeName(stream.getProcessName());
+ productMix.setTreeCode(stream.getProcessCode());
+ productMixService.updateById(productMix);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
+ ProcessInfo processInfo = new ProcessInfo();
+ processInfo.setProcessName(stream.getProcessName());
+ processInfo.setDescription(stream.getDescription());
+ return processInfoService.addOrEdit(processInfo);
+ }
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class})
+ public boolean deleteProcessStream(String id) {
+ if(!ValidateUtil.validateString(id))
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ ProcessStream en = super.getById(id);
+ if(en == null)
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
+ //楠岃瘉宸ュ簭涓嬫槸鍚︽湁宸ユ
+ 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",DocAttributionTypeEnum.PROCESS.getCode().toString()).eq("attribution_id",id));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(ProcessInfoCode.PROCESS_HAS_DOC);
+ }
+ boolean b = productMixService.removeById(id);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
+ return super.removeById(id);
+ }
+
+ @Override
+ public List<ProcessStream> findByNodeParams(ProcessStreamRequest request) {
+ if(request == null || !ValidateUtil.validateString(request.getProductId()) || !ValidateUtil.validateString(request.getComponentId()))
+ return Collections.emptyList();
+ LambdaQueryChainWrapper<ProcessStream> lambdaQuery = super.lambdaQuery().eq(ProcessStream::getProductId, request.getProductId()).eq(ProcessStream::getComponentId, request.getComponentId());
+ if(ValidateUtil.validateString(request.getPartsId())) {
+ lambdaQuery.eq(ProcessStream::getPartsId, request.getPartsId());
+ }else {
+ lambdaQuery.isNull(ProcessStream::getPartsId);
+ }
+ return lambdaQuery.list();
+ }
+
+ @Override
+ public List<ProcessStream> findByProductId(String productId) {
+ return super.lambdaQuery().eq(ProcessStream::getProductId, productId).list();
+ }
+
+ @Override
+ public List<ProcessStream> findByComponentId(String componentId) {
+ return super.lambdaQuery().eq(ProcessStream::getComponentId, componentId).list();
+ }
+
+ @Override
+ public List<ProcessStream> findBypsvId(String psvId) {
+ return super.lambdaQuery().eq(ProcessStream::getPsvId, psvId).list();
+ }
+
+ @Override
+ 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);
+ }
+
+ @Override
+ public ProcessStream findByProcessNoAndComponentId(String processNo, String componentId) {
+ List<ProcessStream> list = super.lambdaQuery().eq(ProcessStream::getComponentId, componentId).eq(ProcessStream::getProcessCode, processNo).list();
+ if(list == null || list.isEmpty())
+ return null;
+ return list.get(0);
+ }
+
+ @Override
+ public List<ProcessStream> validateDeviceProcessInfo(String pnCode, String deviceNo) {
+ if(!ValidateUtil.validateString(pnCode) || !ValidateUtil.validateString(deviceNo))
+ ExceptionCast.cast(CommonCode.INVALID_PARAM);
+ MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(deviceNo);
+ if(mdcEquipment == null)
+ ExceptionCast.cast(DeviceCode.DEVICE_NOT_EXIST);
+ PermissionStream stream = componentInfoService.validateComponentOrPartsPnCode(pnCode);
+ if(stream == null)
+ ExceptionCast.cast(ComponentInfoCode.COMPONENT_PN_NOT_EXIST);
+ LambdaQueryWrapper<ProcessStream> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ProcessStream::getProductId, stream.getProductId());
+ lambdaQueryWrapper.eq(ProcessStream::getComponentId, stream.getComponentId());
+ if(ValidateUtil.validateString(stream.getPartsId())) {
+ lambdaQueryWrapper.eq(ProcessStream::getPartsId, stream.getPartsId());
+ }
+ lambdaQueryWrapper.like(ProcessStream::getProcessingEquipmentCode, deviceNo);
+ List<ProcessStream> list = super.list(lambdaQueryWrapper);
+ if(list == null || list.isEmpty())
+ 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<PermissionStreamNew> 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);
+ }
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),DocAttributionTypeEnum.PROCESS.getCode().toString());
+ if(stream == null) {
+ stream = new PermissionStreamNew();
+ stream.setDepartId(item.getId());
+ stream.setBusinessId(processStream.getProcessId());
+ stream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
+ 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 = permissionStreamNewService.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<PermissionStreamNew> permissionStreamList = new ArrayList<>();
+ departmentList.forEach(item -> {
+ ProcessionDepartment en = processionDepartmentService.getByProcessIdAndDepartId(processStream.getProcessId(), item.getId());
+ if(en != null) {
+ processionDepartmentList.add(en);
+ }
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),DocAttributionTypeEnum.PROCESS.getCode().toString());
+ 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 = permissionStreamNewService.deletePermissionStreamNewByList(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<PermissionStreamNew> 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);
+ }
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),DocAttributionTypeEnum.PROCESS.getCode().toString());
+ if(stream == null) {
+ stream = new PermissionStreamNew();
+ stream.setUserId(item.getId());
+ stream.setBusinessId(processStream.getProcessId());
+ stream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
+ 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 = permissionStreamNewService.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<PermissionStreamNew> permissionStreamList = new ArrayList<>();
+ userList.forEach(item -> {
+ ProcessionPermission en = processStreamPermissionService.getByProcessIdAndUserId(processStream.getProcessId(), item.getId());
+ if(en != null) {
+ permissionList.add(en);
+ }
+ PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),DocAttributionTypeEnum.PROCESS.getCode().toString());
+ 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 = permissionStreamNewService.deletePermissionStreamNewByList(permissionStreamList);
+ if(!b) {
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_USER_PERM_ERROR);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * 閫氳繃宸ュ簭鍙枫�佸伐搴忓悕绉扮瓑鏌ヨ瀵瑰簲鐢靛瓙鏍锋澘
+ * 鐢靛瓙鏍锋澘鐩存帴鎸傚湪宸ュ簭涓�
+ * @param treeInfoRequest
+ * @return
+ */
+ @Override
+ public List<DocInfo> getByProcessStreamOtherFile(TreeInfoRequest treeInfoRequest){
+ LambdaQueryWrapper<ProcessStream> queryWrapper = new LambdaQueryWrapper<>();
+ if (treeInfoRequest.getProductIds() != null && !treeInfoRequest.getProductIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getProductId, treeInfoRequest.getProductIds());
+ }
+ if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getComponentId, treeInfoRequest.getComponentIds());
+ }
+ if (treeInfoRequest.getPartsIds() != null && !treeInfoRequest.getPartsIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getPartsId, treeInfoRequest.getPartsIds());
+ }
+ if (treeInfoRequest.getPsvIds() != null && !treeInfoRequest.getPsvIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getPsvId, treeInfoRequest.getPsvIds());
+ }
+ if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PROCESS.getCode())){
+ queryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),ProcessStream::getProcessId,treeInfoRequest.getAttributionId());
+ }
+ queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),ProcessStream::getProcessName, treeInfoRequest.getTreeName());
+ queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),ProcessStream::getProcessCode, treeInfoRequest.getTreeName());
+ queryWrapper.orderByDesc(ProcessStream::getCreateTime);
+ List<ProcessStream> list = super.list(queryWrapper);
+ List<DocInfo> docInfos;
+ if (list == null || list.isEmpty() || StrUtil.isNotBlank(treeInfoRequest.getStructureType())){
+ return new ArrayList<>();
+ }else {
+ String ids=list.stream().map(ProcessStream::getProcessId).collect(Collectors.joining(","));
+ DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
+ BeanUtil.copyProperties(treeInfoRequest,docQuery);
+ docQuery.setAttributionIds(ids);
+ docQuery.setDocClassCode("OTHER");
+ docQuery.setAttributionType(DocAttributionTypeEnum.PROCESS.getCode());
+ docInfos=docInfoService.findListByDocQuery(docQuery);
+ if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PROCESS.getCode())){
+ List<String> id =new ArrayList<>();
+ id.add(treeInfoRequest.getAttributionId());
+ treeInfoRequest.setProcessIds(id);
+ List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest);
+ docInfos.addAll(workSteps);
+ }
+ }
+ return docInfos;
+ }
+
+ /**
+ * 閫氳繃宸ュ簭鍙枫�佸伐搴忓悕绉扮瓑鏌ヨ瀵瑰簲NC鏂囦欢
+ * NC鏂囦欢瀛樺湪璁惧绫讳笅闈�
+ * @param treeInfoRequest
+ * @return
+ */
+ @Override
+ public List<DocInfo> getByProcessStreamNCFile(TreeInfoRequest treeInfoRequest){
+ LambdaQueryWrapper<ProcessStream> queryWrapper = new LambdaQueryWrapper<>();
+ if (treeInfoRequest.getProductIds() != null && !treeInfoRequest.getProductIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getProductId, treeInfoRequest.getProductIds());
+ }
+ if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getComponentId, treeInfoRequest.getComponentIds());
+ }
+ if (treeInfoRequest.getPartsIds() != null && !treeInfoRequest.getPartsIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getPartsId, treeInfoRequest.getPartsIds());
+ }
+ if (treeInfoRequest.getPsvIds() != null && !treeInfoRequest.getPsvIds().isEmpty()) {
+ queryWrapper.in(ProcessStream::getPsvId, treeInfoRequest.getPsvIds());
+ }
+ if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PROCESS.getCode())){
+ queryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),ProcessStream::getProcessId,treeInfoRequest.getAttributionId());
+ }
+ queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),ProcessStream::getProcessName, treeInfoRequest.getTreeName());
+ queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),ProcessStream::getProcessCode, treeInfoRequest.getTreeName());
+ queryWrapper.orderByDesc(ProcessStream::getCreateTime);
+ List<ProcessStream> list = super.list(queryWrapper);
+ List<DocInfo> docInfos = new ArrayList<>();
+ //NC鏂囦欢瀛樺湪瀵瑰簲鐨勮澶囩被涓嬶紝鎵�浠ラ渶瑕佽繃婊�
+ if (!list.isEmpty()) {
+ List<String> processIds = list.stream().map(ProcessStream::getProcessId).collect(Collectors.toList());
+ List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(processIds,
+ DocAttributionTypeEnum.PROCESS.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
+ if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
+ List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
+ DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
+ BeanUtil.copyProperties(treeInfoRequest,docQuery);
+ docQuery.setAttributionIds(String.join(",",deviceTypeIds));
+ docQuery.setDocClassCode("NC");
+ docQuery.setAttributionType(DocAttributionTypeEnum.PROCESS.getCode());
+ docInfos=docInfoService.findListByDocQuery(docQuery);
+ }
+ if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PROCESS.getCode())){
+ List<String> id =new ArrayList<>();
+ id.add(treeInfoRequest.getAttributionId());
+ treeInfoRequest.setProcessIds(id);
+ List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
+ docInfos.addAll(docInfoList);
+ }else {
+ treeInfoRequest.setProcessIds(processIds);
+ List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
+ docInfos.addAll(docInfoList);
+ }
+ return docInfos;
+ }
+ return null;
+ }
+
+}
--
Gitblit v1.9.3