Merge branch 'mdc_hyjs_master'

zhangherong

2025-06-25 2fb6c67b2c0c72195eef6fe5f7904d739b46e2c0

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java

@@ -1,26 +1,26 @@
package org.jeecg.modules.dnc.service.impl;

import cn.hutool.core.bean.BeanUtil;
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 liquibase.pro.packaged.P;
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.dnc.request.ProcessStreamRequest;
import org.jeecg.modules.dnc.entity.*;
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;
@@ -28,10 +28,8 @@
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.*;
import java.util.stream.Collectors;

@Service
public class ProcessStreamServiceImpl extends ServiceImpl<ProcessStreamMapper, ProcessStream> implements IProcessStreamService {
@@ -43,8 +41,7 @@
    @Autowired
    private IProcessSpecVersionService processSpecVersionService;
    @Autowired
    @Lazy
    private IDeviceInfoService deviceInfoService;
    private IMdcEquipmentService mdcEquipmentService;
    @Autowired
    private IPermissionStreamNewService permissionStreamNewService;
    @Autowired
@@ -56,8 +53,14 @@
    @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) {
@@ -88,7 +91,7 @@
            if(en != null) {
                ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
            }
            oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(psv.getId(),"4","1");
            oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(psv.getId(), DocAttributionTypeEnum.OPERATION.getCode().toString(),"1");
        }else {
            ComponentInfo componentInfo = componentInfoService.getById(stream.getComponentId());
            if(componentInfo == null)
@@ -100,7 +103,7 @@
            if(en != null) {
                ExceptionCast.cast(ProcessInfoCode.PROCESS_IS_EXIST);
            }
            oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","1");
            oldDepartPermList=permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"1");
        }
        boolean b = super.save(stream);
        if(!b)
@@ -117,7 +120,7 @@
                PermissionStreamNew perm = new PermissionStreamNew();
                perm.setDepartId(item.getDepartId());
                perm.setBusinessId(stream.getProcessId());
                perm.setBusinessType("5");
                perm.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
                permissionStreamList.add(perm);
            });
            if(!processionDepartmentList.isEmpty()) {
@@ -132,16 +135,26 @@
            }
        }
        //添加用户权限
        b = productPermissionService.add(stream.getProcessId(), userId,"5");
        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("5");
        return permissionStreamNewService.save(permissionStream);
        permissionStream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
        return permissionStreamNewService.addPermissionStreamNew(permissionStream);
    }

    @Override
@@ -159,8 +172,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.setTreeName(stream.getProcessName());
        productMix.setTreeCode(stream.getProcessCode());
        productMixService.updateById(productMix);
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        ProcessInfo processInfo = new ProcessInfo();
@@ -183,10 +201,13 @@
            ExceptionCast.cast(ProcessInfoCode.WORKSTEP_HAS_DATA);
        }
        //验证是否存在文档
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","5").eq("attribution_id",id));
        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);
    }

@@ -238,8 +259,8 @@
    public List<ProcessStream> validateDeviceProcessInfo(String pnCode, String deviceNo) {
        if(!ValidateUtil.validateString(pnCode) || !ValidateUtil.validateString(deviceNo))
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(deviceNo);
        if(deviceInfo == null)
        MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(deviceNo);
        if(mdcEquipment == null)
            ExceptionCast.cast(DeviceCode.DEVICE_NOT_EXIST);
        PermissionStream stream = componentInfoService.validateComponentOrPartsPnCode(pnCode);
        if(stream == null)
@@ -295,12 +316,12 @@
                en.setProcessId(processStream.getProcessId());
                processionDepartmentList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),"5");
            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("5");
                stream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -342,7 +363,7 @@
            if(en != null) {
                processionDepartmentList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),"5");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processStream.getProcessId(),item.getId(),DocAttributionTypeEnum.PROCESS.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -377,12 +398,12 @@
                en.setProcessId(processStream.getProcessId());
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),"5");
            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("5");
                stream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -413,7 +434,7 @@
            if(en != null) {
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),"5");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), item.getId(),DocAttributionTypeEnum.PROCESS.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -434,4 +455,130 @@
        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;
    }

    @Override
    public boolean assignPermission(Object entity, Collection<SysUser> userList, boolean isAdd){
        if (isAdd) {
            return assignAddUser((ProcessStream) entity, userList);
        } else {
            return assignRemoveUser((ProcessStream) entity, userList);
        }
    }
    @Override
    public boolean assignDepartPermission(Object entity, Collection<MdcProduction> departments, boolean isAdd) {
        if (isAdd) {
            return assignAddDepart((ProcessStream) entity, departments);
        } else {
            return assignRemoveDepart((ProcessStream) entity, departments);
        }
    }

}