添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug

lyh

2025-03-31 bc263d8bed5d1405f275bb8638a9bec9eaf06585

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

@@ -1,26 +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 liquibase.pro.packaged.P;
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;
@@ -28,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 {
@@ -55,6 +45,8 @@
    private IDocRelativeService iDocRelativeService;
    @Autowired
    private IProcessStreamPermissionService processStreamPermissionService;
    @Autowired
    private IProductMixService productMixService;
    @Autowired
    private IProductPermissionService productPermissionService;

@@ -136,12 +128,22 @@
        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(),5,new Date());
        }else {
            productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getComponentId())
                    ,stream.getProcessName(),stream.getProcessCode(),5,new Date());
        }
        productMixService.save(productMix);
        //添加权限验证
        PermissionStreamNew permissionStream = new PermissionStreamNew();
        permissionStream.setUserId(userId);
        permissionStream.setBusinessId(stream.getProcessId());
        permissionStream.setBusinessType("5");
        return permissionStreamNewService.save(permissionStream);
        return permissionStreamNewService.addPermissionStreamNew(permissionStream);
    }

    @Override
@@ -159,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();
@@ -187,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);
    }