1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询

lyh

2025-05-28 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3

1.Dnc产品结构树检索nc文件
2.新增批次功能
3.新增审签查询流程
4.修改刀具系统查询

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/constant/DocAttributionTypeEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package org.jeecg.modules.dnc.constant;

public enum DocAttributionTypeEnum {

    PRODUCT(1, "产品"),
    COMPONENT(2, "部件/子部件"),
    PARTS(3, "零件"),
    OPERATION(4, "工艺规程版本"),
    PROCESS(5, "工序"),
    WORKSITE(6, "工步"),
    DEVICE(7, "设备");

    private Integer code;
    private String name;

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public Integer getCode() {
        return code;
    }

    public void setCode(Integer code) {
        this.code = code;
    }

    DocAttributionTypeEnum() {
    }

    DocAttributionTypeEnum(Integer code, String name) {
        this.code = code;
        this.name = name;
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/CutterController.java

@@ -95,4 +95,19 @@
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, Cutter.class);
    }

    /**
     * æå–刀具
     * @param docId æ–‡æ¡£Id
     * @return
     */
    @AutoLog(value = "刀具信息-提取刀具")
    @ApiOperation(value = "刀具信息-提取刀具", notes = "刀具信息-提取刀具")
    @GetMapping("/extractCutterInfo/{docId}/{attributionType}/{attributionId}")
    public Result<?> extractCutterInfo(@PathVariable("docId") String docId
            ,@PathVariable("attributionType") Integer attributionType
            ,@PathVariable("attributionId") String attributionId) {
        return service.extractAndSaveFromContent(docId,attributionId,attributionType);
    }

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/GuideCardBatchController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,166 @@
package org.jeecg.modules.dnc.controller;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.dnc.entity.GuideCardBatch;
import org.jeecg.modules.dnc.service.IGuideCardBatchService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;

 /**
 * @Description: nc文件对应数控程序加工确认表
 * @Author: jeecg-boot
 * @Date:   2025-05-27
 * @Version: V1.0
 */
@Api(tags="nc文件对应数控程序加工确认表")
@RestController
@RequestMapping("/dnc/guideCardBatch")
@Slf4j
public class GuideCardBatchController extends JeecgController<GuideCardBatch, IGuideCardBatchService> {
    @Autowired
    private IGuideCardBatchService guideCardBatchService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param guideCardBatch
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "nc文件对应数控程序加工确认表-分页列表查询")
    @ApiOperation(value="nc文件对应数控程序加工确认表-分页列表查询", notes="nc文件对应数控程序加工确认表-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<GuideCardBatch>> queryPageList(GuideCardBatch guideCardBatch,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<GuideCardBatch> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq(StrUtil.isNotEmpty(guideCardBatch.getDocId()), "doc_id", guideCardBatch.getDocId());
        queryWrapper.like(StrUtil.isNotEmpty(guideCardBatch.getSerialNumber()), "serial_number", guideCardBatch.getSerialNumber());
        queryWrapper.like(StrUtil.isNotEmpty(guideCardBatch.getProcessingBatch()), "processing_batch", guideCardBatch.getProcessingBatch());
        queryWrapper.like(StrUtil.isNotEmpty(guideCardBatch.getFixtureInformation()), "fixture_information", guideCardBatch.getFixtureInformation());
        queryWrapper.orderByAsc("create_time");
        Page<GuideCardBatch> page = new Page<GuideCardBatch>(pageNo, pageSize);
        IPage<GuideCardBatch> pageList = guideCardBatchService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     *   æ·»åŠ 
     *
     * @param guideCardBatch
     * @return
     */
    @AutoLog(value = "nc文件对应数控程序加工确认表-添加")
    @ApiOperation(value="nc文件对应数控程序加工确认表-添加", notes="nc文件对应数控程序加工确认表-添加")
    //@RequiresPermissions("org.jeecg.modules:nc_guide_card_batch:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody GuideCardBatch guideCardBatch) {
        guideCardBatchService.save(guideCardBatch);
        return Result.OK("添加成功！");
    }

    /**
     *  ç¼–辑
     *
     * @param guideCardBatch
     * @return
     */
    @AutoLog(value = "nc文件对应数控程序加工确认表-编辑")
    @ApiOperation(value="nc文件对应数控程序加工确认表-编辑", notes="nc文件对应数控程序加工确认表-编辑")
    //@RequiresPermissions("org.jeecg.modules:nc_guide_card_batch:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody GuideCardBatch guideCardBatch) {
        guideCardBatchService.updateById(guideCardBatch);
        return Result.OK("编辑成功!");
    }

    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "nc文件对应数控程序加工确认表-通过id删除")
    @ApiOperation(value="nc文件对应数控程序加工确认表-通过id删除", notes="nc文件对应数控程序加工确认表-通过id删除")
    //@RequiresPermissions("org.jeecg.modules:nc_guide_card_batch:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        guideCardBatchService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "nc文件对应数控程序加工确认表-批量删除")
    @ApiOperation(value="nc文件对应数控程序加工确认表-批量删除", notes="nc文件对应数控程序加工确认表-批量删除")
    //@RequiresPermissions("org.jeecg.modules:nc_guide_card_batch:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.guideCardBatchService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "nc文件对应数控程序加工确认表-通过id查询")
    @ApiOperation(value="nc文件对应数控程序加工确认表-通过id查询", notes="nc文件对应数控程序加工确认表-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<GuideCardBatch> queryById(@RequestParam(name="id",required=true) String id) {
        GuideCardBatch guideCardBatch = guideCardBatchService.getById(id);
        if(guideCardBatch==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(guideCardBatch);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param guideCardBatch
    */
    //@RequiresPermissions("org.jeecg.modules:nc_guide_card_batch:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, GuideCardBatch guideCardBatch) {
        return super.exportXls(request, guideCardBatch, GuideCardBatch.class, "nc文件对应数控程序加工确认表");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    //@RequiresPermissions("nc_guide_card_batch:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, GuideCardBatch.class);
    }

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ProductInfoController.java

@@ -288,4 +288,19 @@
        return Result.ok(list);
    }

    /**
     * é€šè¿‡ä»£å·ã€åç§°ã€æè´¨ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * @param treeInfoRequest
     * @return
     */
    @AutoLog(value = "零件信息表-通过代号、名称、材质等查询对应NC文件")
    @ApiOperation(value = "零件信息表-通过代号、名称、材质等查询对应NC文件", notes = "零件信息表-通过代号、名称、材质等查询对应NC文件")
    @GetMapping("/query/nc")
    public Result<?> queryOtherFileInfo(TreeInfoRequest treeInfoRequest) {
        List<DocInfo> list = productInfoService.getByTreeNcFileInfo(treeInfoRequest);
        if (list == null)
            list = Collections.emptyList();
        return Result.ok(list);
    }

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java

@@ -33,6 +33,11 @@
    @TableField(value = "attribution_type")
    private Integer attributionType;

    //对应文档id
    @Excel(name = "对应文档id", width = 15)
    @TableField(value = "doc_id")
    private String docId;

    //刀具名称
    @Excel(name = "刀具名称", width = 15)
    @TableField(value = "cutter_name")
@@ -64,6 +69,11 @@
    @TableField(value = "quantity")
    private Integer quantity;

    //刀具规格
    @Excel(name = "刀具规格", width = 15)
    @TableField(value = "cutter_spec")
    private String cutterSpec;

    //描述
    @Excel(name = "描述", width = 15)
    @TableField(value = "description")

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java

@@ -69,6 +69,7 @@
    @TableField(exist = false)
    private String attributionId;
    @TableField(exist = false)
    @Dict(dictTable = "nc_doc_classification", dicCode = "classification_id", dicText = "classification_code")
    private String classificationId;
    //同步状态 1 æœªåŒæ­¥ 2 å·²åŒæ­¥
    @TableField(exist = false)
@@ -81,5 +82,11 @@
    //所属节点代号
    @TableField(exist = false)
    private String nodeCode;
    //设备类名称
    @TableField(exist = false)
    private String deviceName;
    //设备类分级
    @TableField(exist = false)
    private String deviceCode;

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/GuideCardBatch.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,163 @@
package org.jeecg.modules.dnc.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.util.Date;

/**
 * @Description: nc文件对应数控程序加工确认表
 * @Author: jeecg-boot
 * @Date:   2025-05-27
 * @Version: V1.0
 */
@Data
@TableName("nc_guide_card_batch")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nc_guide_card_batch对象", description="nc文件对应数控程序加工确认表")
public class GuideCardBatch implements Serializable {
    private static final long serialVersionUID = 1L;

    /**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "主键")
    private String id;
    /**nc文档表主键*/
    @Excel(name = "nc文档表主键", width = 15)
    @ApiModelProperty(value = "nc文档表主键")
    private String docId;
    /**mes标识*/
    @Excel(name = "mes标识", width = 15)
    @ApiModelProperty(value = "mes标识")
    private String mesSign;
    /**批次号*/
    @Excel(name = "批次号", width = 15)
    @ApiModelProperty(value = "批次号")
    private String batchNumber;
    /**流水号*/
    @Excel(name = "流水号", width = 15)
    @ApiModelProperty(value = "流水号")
    private String serialNumber;
    /**单位*/
    @Excel(name = "单位", width = 15)
    @ApiModelProperty(value = "单位")
    private String unit;
    /**程序文件名*/
    @Excel(name = "程序文件名", width = 15)
    @ApiModelProperty(value = "程序文件名")
    private String docName;
    /**零件图号*/
    @Excel(name = "零件图号", width = 15)
    @ApiModelProperty(value = "零件图号")
    private String partsCode;
    /**零件名称*/
    @Excel(name = "零件名称", width = 15)
    @ApiModelProperty(value = "零件名称")
    private String partsName;
    /**零件材料*/
    @Excel(name = "零件材料", width = 15)
    @ApiModelProperty(value = "零件材料")
    private String materielDesp;
    /**夹具*/
    @Excel(name = "夹具", width = 15)
    @ApiModelProperty(value = "夹具")
    private String fixtureInformation;
    /**工序（工步号）*/
    @Excel(name = "工序（工步号）", width = 15)
    @ApiModelProperty(value = "工序（工步号）")
    private String processWorkCode;
    /**加工批次*/
    @Excel(name = "加工批次", width = 15)
    @ApiModelProperty(value = "加工批次")
    private String processingBatch;
    /**加工数量*/
    @Excel(name = "加工数量", width = 15)
    @ApiModelProperty(value = "加工数量")
    private String processingQuantity;
    /**加工设备*/
    @Excel(name = "加工设备", width = 15)
    @ApiModelProperty(value = "加工设备")
    private String processingEquipment;
    /**图片*/
    @Excel(name = "图片", width = 15)
    @ApiModelProperty(value = "图片")
    private String picture;
    /**说明信息*/
    @Excel(name = "说明信息", width = 15)
    @ApiModelProperty(value = "说明信息")
    private String remake;
    /**流程状态*/
    @Excel(name = "流程状态", width = 15)
    @ApiModelProperty(value = "流程状态")
    private String flowStatus;
    /**编写人*/
    @Excel(name = "编写人", width = 15)
    @ApiModelProperty(value = "编写人")
    private String compiler;
    /**编写日期*/
    @Excel(name = "编写日期", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "编写日期")
    private Date compilerTime;
    /**校对人*/
    @Excel(name = "校对人", width = 15)
    @ApiModelProperty(value = "校对人")
    private String proofreader;
    /**校对日期*/
    @Excel(name = "校对日期", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "校对日期")
    private Date proofreaderTime;
    /**操作者*/
    @Excel(name = "操作者", width = 15)
    @ApiModelProperty(value = "操作者")
    private String operator;
    /**首检日期*/
    @Excel(name = "首检日期", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "首检日期")
    private Date inspectionTime;
    /**审批人*/
    @Excel(name = "审批人", width = 15)
    @ApiModelProperty(value = "审批人")
    private String approver;
    /**审批日期*/
    @Excel(name = "审批日期", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "审批日期")
    private Date approverTime;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建日期")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "更新日期")
    private Date updateTime;
    /**所属部门*/
    @ApiModelProperty(value = "所属部门")
    private String sysOrgCode;
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DeviceTypeMapper.java

@@ -1,7 +1,18 @@
package org.jeecg.modules.dnc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.dnc.entity.DeviceType;

import java.util.List;

public interface DeviceTypeMapper extends BaseMapper<DeviceType> {

    /**
     * æ£€ç´¢NC查询对应的设备类
     * @param attributionIds,attributionType,deviceManagementName,deviceManagementCode
     * @return
     */
    List<DeviceType> getDeviceTypeByAttribution(@Param("attributionIds") List<String> attributionIds, @Param("attributionType") Integer attributionType,
                                                @Param("deviceManagementName") String deviceManagementName,@Param("deviceManagementCode") String deviceManagementCode);
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/GuideCardBatchMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.dnc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.dnc.entity.GuideCardBatch;

/**
 * @Description: nc文件对应数控程序加工确认表
 * @Author: jeecg-boot
 * @Date:   2025-05-27
 * @Version: V1.0
 */
public interface GuideCardBatchMapper extends BaseMapper<GuideCardBatch> {

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DeviceTypeMapper.xml

@@ -1,4 +1,29 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.jeecg.modules.dnc.mapper.DeviceTypeMapper">
    <select id="getDeviceTypeByAttribution" resultType="org.jeecg.modules.dnc.entity.DeviceType">
        SELECT
        nc_device_type.*,
        nc_device_management.device_management_name,
        nc_device_management.device_management_code
        FROM
        nc_device_type
        LEFT JOIN nc_device_management
        ON nc_device_type.device_management_id = nc_device_management.id
        WHERE
        1 = 1
        <if test="attributionIds != null and attributionIds.size() > 0">
            AND nc_device_type.attribution_id IN
            <foreach collection="attributionIds" item="attributionId" open="(" close=")" separator=",">
                #{attributionId}
            </foreach>
        </if>
        AND nc_device_type.attribution_type = #{attributionType}
        <if test="deviceManagementName != null and deviceManagementName != ''">
            AND nc_device_management.device_management_name LIKE CONCAT('%', #{deviceManagementName}, '%')
        </if>
        <if test="deviceManagementCode != null and deviceManagementCode != ''">
            AND nc_device_management.device_management_code LIKE CONCAT('%', #{deviceManagementCode}, '%')
        </if>
    </select>
</mapper>

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml

@@ -2,32 +2,47 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.jeecg.modules.dnc.mapper.DocInfoMapper">
    <select id="findDocExtList" parameterType="String" resultType="org.jeecg.modules.dnc.entity.DocInfo">
        select
        u.doc_id
        ,r.classification_id
        , CONCAT(u.doc_name, '.', u.doc_suffix) as doc_name
        ,u.doc_alias
        ,u.doc_code
        ,u.doc_suffix
        ,r.attribution_type
        ,r.attribution_id
        ,u.doc_status
        ,u.doc_dispatch_status
        ,u.publish_file_id
        ,u.publish_version
        ,u.description
        ,u.CREATE_TIME
        ,u.create_by
        ,u.UPDATE_TIME
        ,u.update_by
        ,(case when o.doc_id is null then 1 else 2 end) as pullStatus
        ,o.create_by as pullUser
        from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
        inner join
        (select * from nc_doc_info where delete_flag=0) u
        on r.doc_id = u.doc_id
        left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
        on u.doc_id=o.doc_id
        SELECT
            u.doc_id,
            r.classification_id,
            CONVERT(VARCHAR(500),
                    CONCAT(
                            u.doc_name COLLATE Chinese_PRC_CI_AS,
                            '.' COLLATE Chinese_PRC_CI_AS,
                            u.doc_suffix COLLATE Chinese_PRC_CI_AS
                    )
            ) AS doc_name,  -- ç»Ÿä¸€æŽ’序规则并显式转换类型
            u.doc_alias,
            u.doc_code,
            u.doc_suffix,
            r.attribution_type,
            r.attribution_id,
            u.doc_status,
            u.doc_dispatch_status,
            u.publish_file_id,
            u.publish_version,
            u.description,
            u.CREATE_TIME,
            u.create_by,
            u.UPDATE_TIME,
            u.update_by,
            (CASE WHEN o.doc_id IS NULL THEN 1 ELSE 2 END) AS pullStatus,
            o.create_by AS pullUser
        FROM (
                 SELECT classification_id, doc_id, attribution_type, attribution_id
                 FROM nc_doc_relative
                 WHERE delete_flag = 0
             ) r
                 INNER JOIN (
            SELECT *
            FROM nc_doc_info
            WHERE delete_flag = 0
        ) u ON r.doc_id = u.doc_id
                 LEFT JOIN (
            SELECT doc_id, create_by
            FROM nc_file_operate
            WHERE delete_flag = 0
        ) o ON u.doc_id = o.doc_id
        ${ew.customSqlSegment}
    </select>

@@ -36,7 +51,13 @@
        select
        u.doc_id
        ,r.classification_id
        , CONCAT(u.doc_name, '.', u.doc_suffix) as doc_name
        ,             CONVERT(VARCHAR(500),
                CONCAT(
                        u.doc_name COLLATE Chinese_PRC_CI_AS,
                        '.' COLLATE Chinese_PRC_CI_AS,
                        u.doc_suffix COLLATE Chinese_PRC_CI_AS
                )
                      ) AS doc_name  -- ç»Ÿä¸€æŽ’序规则并显式转换类型
        ,u.doc_alias
        ,u.doc_code
        ,u.doc_suffix

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/GuideCardBatchMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dnc.mapper.GuideCardBatchMapper">

</mapper>

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/request/TreeInfoRequest.java

@@ -18,12 +18,24 @@

    private List<String> partsIds;

    private List<String> psvIds;

    private List<String> processIds;

    /**节点名称*/
    private String treeName;

    private String structureType;

    /**节点编号*/
    private String treeCode;

    /**数控系统类别*/
    private String deviceManagementName;

    /**轴数*/
    private String deviceManagementCode;

    private String structureType;

    @ApiModelProperty(value = "文档id")
    private String docId;


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/response/ActivitiCode.java

@@ -23,7 +23,7 @@
    ACT_DOC_ERROR(false,21015,"启动流程失败，文档信息错误！"),
    ACT_DEVICE_DOC_ERROR(false,21016,"启动流程失败，设备已存在该文档！"),
    ACT_DOC_ERROR_DELEVE(false,21017,"启动流程失败，重复数据删除失败！"),
    ACT_DEVICE_DOC_FILELABLE(false,21016,"密标系统异常,！");
    ACT_DEVICE_DOC_FILELABLE(false,21018,"密标系统异常,！");

    //操作代码
    @ApiModelProperty(value = "操作是否成功", example = "true", required = true)
@@ -35,7 +35,7 @@
    //提示信息
    @ApiModelProperty(value = "操作提示", example = "操作过于频繁！", required = true)
    String message;
    private ActivitiCode(boolean success, int code, String message){
    ActivitiCode(boolean success, int code, String message){
        this.success = success;
        this.code = code;
        this.message = message;

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

@@ -34,4 +34,11 @@
     */
    Result<?> query(Cutter cutter, Integer pageNo, Integer pageSize);

    /**
     * ä»ŽNC文件内容提取刀具信息并保存
     * @param docId æ–‡æ¡£id
     */
    Result<?> extractAndSaveFromContent(String docId,String attributionId,Integer attributionType);


}

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

@@ -42,4 +42,11 @@
     */
    Result<?> getByBusinessId(String businessId, String type);

    /**
     * æ£€ç´¢NC查询对应的设备类
     * @param attributionIds,attributionType,systemType,deviceManagementCode
     * @return
     */
    List<DeviceType> getDeviceTypeByAttribution(List<String> attributionIds, Integer attributionType, String systemType, String deviceManagementCode);

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.GuideCardBatch;

/**
 * @Description: nc文件对应数控程序加工确认表
 * @Author: jeecg-boot
 * @Date:   2025-05-27
 * @Version: V1.0
 */
public interface IGuideCardBatchService extends IService<GuideCardBatch> {

    /**
     * ç”Ÿæˆæµæ°´å·
     * @param code
     * @return
     */
    String getSerialNumber(String code);
}

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

@@ -1,8 +1,10 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.ProcessStream;
import org.jeecg.modules.dnc.request.ProcessStreamRequest;
import org.jeecg.modules.dnc.request.TreeInfoRequest;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;

@@ -140,4 +142,19 @@
     * @return
     */
    boolean assignRemoveUser(ProcessStream processStream, Collection<SysUser> userList);

    /**
     * é€šè¿‡å·¥åºå·ã€å·¥åºåç§°ç­‰æŸ¥è¯¢å¯¹åº”电子样板
     * @param treeInfoRequest
     * @return
     */
    List<DocInfo> getByProcessStreamOtherFile(TreeInfoRequest treeInfoRequest);

    /**
     * é€šè¿‡å·¥åºå·ã€å·¥åºåç§°ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * NC文件存在设备类下面
     * @param treeInfoRequest
     * @return
     */
    List<DocInfo> getByProcessStreamNCFile(TreeInfoRequest treeInfoRequest);
}

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

@@ -232,5 +232,12 @@
     * @return
     */
    List<DocInfo> getByTreeOtherFileInfo(TreeInfoRequest treeInfoRequest);

    /**
     * é€šè¿‡ä»£å·ã€åç§°ã€æè´¨ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * @param treeInfoRequest
     * @return
     */
    List<DocInfo> getByTreeNcFileInfo(TreeInfoRequest treeInfoRequest);
}


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

@@ -1,7 +1,9 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.WorkStep;
import org.jeecg.modules.dnc.request.TreeInfoRequest;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;

@@ -98,4 +100,22 @@
     * @return
     */
    boolean assignRemoveUser(WorkStep workStep, Collection<SysUser> userList);


    /**
     * é€šè¿‡å·¥æ­¥å·ã€å·¥æ­¥åç§°ç­‰æŸ¥è¯¢å¯¹åº”电子样板
     * NC文件存在设备类下面
     * @param treeInfoRequest
     * @return
     */
    List<DocInfo> getByWorkStepOtherFile(TreeInfoRequest treeInfoRequest);

    /**
     * é€šè¿‡å·¥æ­¥å·ã€å·¥æ­¥åç§°ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * NC文件存在设备类下面
     * @param treeInfoRequest
     * @return
     */
    List<DocInfo> getByWorkStepNCFile(TreeInfoRequest treeInfoRequest);

}

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

@@ -11,6 +11,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.constant.DocAttributionTypeEnum;
import org.jeecg.modules.dnc.dto.ComponentExt;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
@@ -89,10 +90,10 @@
            if(en == null) {
                ExceptionCast.cast(ComponentInfoCode.COMPONENT_PARENT_NOT_EXIST);
            }
            oldPermissionList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(en.getComponentId(),"2","1");
            oldPermissionList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(en.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"1");
            componentInfo.setRankLevel(en.getRankLevel() + 1);
        } else {
            oldPermissionList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(productInfo.getProductId(),"1","1");
            oldPermissionList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(productInfo.getProductId(),DocAttributionTypeEnum.PRODUCT.getCode().toString(),"1");
            componentInfo.setParentId(null);
            componentInfo.setRankLevel(1);
        }
@@ -113,7 +114,7 @@
                PermissionStreamNew permissionStream = new PermissionStreamNew();
                permissionStream.setBusinessId(componentInfo.getComponentId());
                permissionStream.setDepartId(item.getDepartId());
                permissionStream.setBusinessType("2");
                permissionStream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
                componentDepartPermList.add(permissionStream);
            });
        }
@@ -127,7 +128,7 @@
            if(!b)
                ExceptionCast.cast(CommonCode.FAIL);
        }
        b = productPermissionService.add(componentInfo.getComponentId(), userId,"2");
        b = productPermissionService.add(componentInfo.getComponentId(), userId,DocAttributionTypeEnum.COMPONENT.getCode().toString());
        if (!b) {
            ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
        }
@@ -145,7 +146,7 @@
        if (StrUtil.isNotEmpty(componentInfo.getBorrowId())){
            //借用部件,同步添加文件
            List<DocRelative> docRelativeList=docRelativeService.
                    list(new QueryWrapper<DocRelative>().eq("attribution_type","2").eq("attribution_id",componentInfo.getBorrowId()));
                    list(new QueryWrapper<DocRelative>().eq("attribution_type",DocAttributionTypeEnum.COMPONENT.getCode().toString()).eq("attribution_id",componentInfo.getBorrowId()));
            if (!docRelativeList.isEmpty()){
                docRelativeList.forEach(item -> {
                    DocRelative docRelative = new DocRelative();
@@ -160,7 +161,7 @@
        PermissionStreamNew stream = new PermissionStreamNew();
        stream.setUserId(userId);
        stream.setBusinessId(componentInfo.getComponentId());
        stream.setBusinessType("2");
        stream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
        return permissionStreamNewService.addPermissionStreamNew(stream);
    }

@@ -200,12 +201,12 @@
            if(!b)
                return false;
        }
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId,"2");
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId,DocAttributionTypeEnum.COMPONENT.getCode().toString());
        if(stream == null) {
            stream = new PermissionStreamNew();
            stream.setUserId(userId);
            stream.setBusinessId(id);
            stream.setBusinessType("2");
            stream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
            return permissionStreamNewService.save(stream);
        }
        List<ComponentInfo> list = super.lambdaQuery().eq(ComponentInfo::getBorrowId,id).list();
@@ -265,10 +266,10 @@
            b = componentDepartmentService.deleteByComponentId(item.getComponentId());
            if(!b)
                ExceptionCast.cast(ComponentInfoCode.COMPONENT_DELETE_PERM_NONE);
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getComponentId(),"2","0");
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"0");
            if(!b)
                ExceptionCast.cast(ComponentInfoCode.COMPONENT_DELETE_PERM_NONE);
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getComponentId(),"2","1");
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"1");
            if(!b)
                ExceptionCast.cast(ComponentInfoCode.COMPONENT_DELETE_PERM_NONE);
            b = super.removeById(item.getComponentId());
@@ -307,7 +308,7 @@
        }
        boolean b;
        //验证是否存在文档
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","2").eq("attribution_id",id));
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type",DocAttributionTypeEnum.COMPONENT.getCode().toString()).eq("attribution_id",id));
        if (!docRelativeList.isEmpty()){
            ExceptionCast.cast(ComponentInfoCode.COMPONENT_DOC_EXIST);
        }
@@ -317,10 +318,10 @@
        b = componentDepartmentService.deleteByComponentId(id);
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","0");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"0");
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","1");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"1");
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = productMixService.removeById(id);
@@ -361,7 +362,7 @@
                stream = new PermissionStreamNew();
                stream.setUserId(item.getId());
                stream.setBusinessId(componentInfo.getComponentId());
                stream.setBusinessType("2");
                stream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -431,12 +432,12 @@
                en.setComponentId(componentInfo.getComponentId());
                componentDepartments.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),"2");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),DocAttributionTypeEnum.COMPONENT.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setDepartId(item.getId());
                stream.setBusinessId(componentInfo.getComponentId());
                stream.setBusinessType("2");
                stream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -467,7 +468,7 @@
            if(en != null) {
                componentDepartments.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),"2");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(componentInfo.getComponentId(), item.getId(),DocAttributionTypeEnum.COMPONENT.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -613,7 +614,7 @@
        if (productIds != null && !productIds.isEmpty()) {
            List<String> productIdList = Arrays.asList(productIds.split(","));
            List<ProductMix> productMixList = permissionStreamNewService.
                    loadProductMixByBusinessIdAndBusinessType(loginUser.getId(),productIdList,componentInfo.getComponentId(),"2");
                    loadProductMixByBusinessIdAndBusinessType(loginUser.getId(),productIdList,componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString());
            List<Long> ids = productMixList.stream().map(ProductMix::getId).collect(Collectors.toList());
            //获取已经自身被借用的部件
            LambdaQueryWrapper<ComponentInfo> borrowQueryWrapper = new LambdaQueryWrapper<>();
@@ -651,7 +652,7 @@
        List<String> productIdList = Arrays.asList(loginUser.getProductionIds().split(","));
        //获取可以借用的部件
        List<ProductMix> productMixList = permissionStreamNewService.
                loadProductMixByBusinessIdAndBusinessType(loginUser.getId(),productIdList,componentInfo.getComponentId(),"2");
                loadProductMixByBusinessIdAndBusinessType(loginUser.getId(),productIdList,componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString());
        Set<Long> allowedIds = productMixList.stream()
                .map(ProductMix::getId)
                .collect(Collectors.toCollection(HashSet::new));

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

@@ -5,20 +5,42 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.dnc.entity.Cutter;
import org.jeecg.modules.dnc.entity.DocFile;
import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.CutterMapper;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.service.ICutterService;
import org.jeecg.modules.dnc.service.IDocFileService;
import org.jeecg.modules.dnc.service.IDocInfoService;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.dnc.utils.file.FileUtilS;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

@Service
@Slf4j
public class CutterServiceImpl extends ServiceImpl<CutterMapper, Cutter> implements ICutterService {

    @Autowired
    private IDocInfoService docInfoService;

    @Autowired
    private IDocFileService docFileService;

    @Autowired
    private ISysDictService sysDictService;

    /**
     * æ–°å¢žåˆ€å…·ä¿¡æ¯
@@ -108,6 +130,8 @@
        queryWrapper.eq(StrUtil.isNotEmpty(cutter.getAttributionId()),"attribution_id",cutter.getAttributionId());
        queryWrapper.eq("attribution_type",cutter.getAttributionType());
        queryWrapper.eq(StrUtil.isNotEmpty(cutter.getCutterCode()),"cutter_code",cutter.getCutterCode());
        queryWrapper.eq(StrUtil.isNotEmpty(cutter.getCutterType()),"cutter_type",cutter.getCutterType());
        queryWrapper.eq(StrUtil.isNotEmpty(cutter.getCutterSpacing()),"cutter_spacing",cutter.getCutterSpacing());
        return baseMapper.selectList(queryWrapper);
    }

@@ -123,6 +147,7 @@
        if (cutter.getAttributionType() != null){
            queryWrapper.eq("attribution_type",cutter.getAttributionType());
        }
        queryWrapper.eq(StrUtil.isNotEmpty(cutter.getDocId()),"doc_id",cutter.getDocId());
        queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterCode()),"cutter_code",cutter.getCutterCode());
        queryWrapper.like(StrUtil.isNotEmpty(cutter.getCutterName()),"cutter_name",cutter.getCutterName());
        queryWrapper.orderByDesc("create_time");
@@ -130,4 +155,118 @@
        IPage<Cutter> cutterIPage = baseMapper.selectPage(page, queryWrapper);
        return Result.OK(cutterIPage);
    }

    /**
     * ä»ŽNC文件内容提取刀具信息并保存
     */
    @Override
    @Transactional
    public Result<?> extractAndSaveFromContent(String docId,String attributionId,Integer attributionType){
        DocInfo docInfo=docInfoService.getById(docId);
        if (docInfo == null) {
            return Result.error("未找到对应文档信息，无法提取刀具信息");
}
        docInfo.setAttributionId(attributionId);
        docInfo.setAttributionType(attributionType);
        DocFile docFile=docFileService.getById(docInfo.getPublishFileId());
        if (docFile == null) {
            return Result.error("未找到对应文件信息，无法提取刀具信息");
        }
        String filePath = docFile.getFilePath();
        String fileEncodeName = docFile.getFileEncodeName();
        //文档内容
        List<String> list = FileUtilS.readFile(fileEncodeName, filePath);
        if (list == null || list.isEmpty()) {
            return Result.error("文档内容为空，无法提取刀具信息");
        }
        List<Cutter> cutterList = extractToolAfterM6(docInfo,list);
        // ä¿å­˜åˆ€å…·
        if (!cutterList.isEmpty()) {
            this.saveBatch(cutterList);
            //TODO发送刀具管理数据
            return Result.OK("提取刀具信息成功");
        }else {
            return Result.error("未发现刀具的参数信息注释，无法提取刀具信息");
        }
    }

    public List<Cutter> extractToolAfterM6(DocInfo docInfo, List<String> ncLines) {
        List<Cutter> cutterList = new ArrayList<>();
        String currentToolCode = null; // ç”¨äºŽè¿½è¸ªå½“前换刀指令的刀具号

        for (String line : ncLines) {
            String trimmedLine = line.trim();

            // 1. åŒ¹é… M6 æ¢åˆ€æŒ‡ä»¤ï¼Œæå– T代码（如 T01 M06 æˆ– T 02 M06）
            if (trimmedLine.contains("M6")||trimmedLine.contains("M06")) {
                currentToolCode = extractToolCodeFromM6Line(trimmedLine);
            }

            // 2. åŒ¹é…åˆ€å…·å‚数注释（紧跟在 M6 åŽçš„括号内容）
            if (currentToolCode != null && trimmedLine.startsWith("(") && trimmedLine.endsWith(")")) {
                String toolDescription = trimmedLine.substring(1, trimmedLine.length() - 1).trim();
                if (!toolDescription.isEmpty()) {
                    Cutter cutter = new Cutter();
                    cutter.setDocId(docInfo.getDocId());
                    cutter.setAttributionId(docInfo.getAttributionId());
                    cutter.setAttributionType(docInfo.getAttributionType());
                    cutter.setDescription(toolDescription);

                    // ä»Žåˆ€å…·æè¿°ä¸­æå– cutterCode (例如从 "90E-10A" ä¸­æå– "E")
                    extractToolInfoFromDescription(toolDescription, cutter);

                    // è®¾ç½®åˆ€å…·é—´è·ï¼ˆä½¿ç”¨T代码或其他逻辑）
                    cutter.setCutterSpacing(currentToolCode);

                    // æ‹†åˆ†åˆ€å…·åç§°ä¸Žè§„格（简单按空格分割，前部分为名称，后部分为规格）
                    String[] parts = toolDescription.split(" ", 2);
                    if (parts.length >= 1) {
                        cutter.setCutterName(parts[0]);
                    }
                    cutterList.add(cutter);
                    currentToolCode = null; // é‡ç½®ï¼Œé¿å…é‡å¤åŒ¹é…
                }
            }
        }

        return cutterList;
    }

    /**
     * ä»Žåˆ€å…·æè¿°ä¸­æå– cutterType å’Œ cutterCode
     * ä¾‹å¦‚: "8CH-90A" -> cutterType="CH", cutterCode="90A"
     */
    private void extractToolInfoFromDescription(String description, Cutter cutter) {
        // æå–刀具型号（一个或多个连续的大写字母）
        String cutterType = extractCutterType(description);
        cutter.setCutterType(cutterType);
        // æå–破折号后的规格部分
        String cutterSpec = "";
        int dashIndex = description.indexOf('-');
        if (dashIndex != -1 && dashIndex < description.length() - 1) {
            cutterSpec = description.substring(dashIndex + 1).trim();
            cutter.setCutterSpec(cutterSpec);
        }
    }

    /**
     * æå–刀具型号（一个或多个连续的大写字母）
     */
    private String extractCutterType(String description) {
        Pattern pattern = Pattern.compile("[A-Z]+");
        Matcher matcher = pattern.matcher(description);

        if (matcher.find()) {
            return matcher.group();
        }

        return description;
    }

    // è¾…助方法：从 M6 è¡Œæå– T代码（支持 T01 æˆ– T 01 æ ¼å¼ï¼‰
    private String extractToolCodeFromM6Line(String line) {
        Matcher matcher = Pattern.compile("T(\\d+)").matcher(line);
        return matcher.find() ? "T" + matcher.group(1).trim() : null;
    }
}


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

@@ -147,4 +147,14 @@
        });
        return Result.OK(list);
    }

    /**
     * æ£€ç´¢NC查询对应的设备类
     * @param attributionIds,attributionType,deviceManagementName,deviceManagementCode
     * @return
     */
    @Override
    public List<DeviceType> getDeviceTypeByAttribution(List<String> attributionIds, Integer attributionType, String deviceManagementName, String deviceManagementCode){
        return this.baseMapper.getDeviceTypeByAttribution(attributionIds, attributionType, deviceManagementName, deviceManagementCode);
    }
}

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

@@ -159,6 +159,7 @@
            }
        }
        boolean saveBool = super.save(docInfo);
        if (uploadRequest.getDocClassCode().equals("NC")||uploadRequest.getDocClassCode().equals("other")){
        SysParams sysParams=sysParamsService.getSysPramBySettingKey("nc_dispatch_file");
        if (sysParams ==null){
            throw new JeecgBootException("未配置导入NC与电子图版是否触发审签流程，请联系管理员");
@@ -174,6 +175,7 @@
                dispatchFileService.saveDispatchFile(dispatchFile);
            }
        }
        }
        return saveBool;
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
package org.jeecg.modules.dnc.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.dnc.entity.GuideCardBatch;
import org.jeecg.modules.dnc.mapper.GuideCardBatchMapper;
import org.jeecg.modules.dnc.service.IGuideCardBatchService;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

/**
 * @Description: nc文件对应数控程序加工确认表
 * @Author: jeecg-boot
 * @Date:   2025-05-27
 * @Version: V1.0
 */
@Service
public class GuideCardBatchServiceImpl extends ServiceImpl<GuideCardBatchMapper, GuideCardBatch> implements IGuideCardBatchService {

    @Autowired
    private ISysDictService sysDictService;

    /**
     * ç”Ÿæˆæµæ°´å·
     * @param code
     * @return
     */
    @Override
    public String getSerialNumber(String code) {
        // äº‹ä»¶ç¼–号格式：年份后两位 + å•ä½ç¼–码 + æ“ä½œå·¥è´¦å· + æµæ°´å·ï¼ˆ4位）
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();

        // èŽ·å–当前年份后两位
        String yearSuffix = DateUtils.formatDate(new Date(), "yy");

        // æŸ¥è¯¢å½“年所有记录
        QueryWrapper<GuideCardBatch> wrapper = new QueryWrapper<>();
        wrapper.likeRight("create_time", DateUtils.formatDate(new Date(), "yyyy"));
        wrapper.isNotNull("serial_number");
        wrapper.orderByDesc("SUBSTR(serial_number, -4)");

        List<GuideCardBatch> list = this.list(wrapper);

        // ç”Ÿæˆæµæ°´å·é€»è¾‘
        String serialSuffix;
        if (!list.isEmpty()) {
            // æå–最新流水号的后四位
            String lastSerial = list.get(0).getSerialNumber();
            String lastSuffix = lastSerial.substring(lastSerial.length() - 4);

            // æµæ°´å·è‡ªå¢žï¼ˆå¤„理9999溢出）
            int nextNum = Integer.parseInt(lastSuffix) + 1;
            serialSuffix = String.format("%04d", nextNum > 9999 ? 1 : nextNum); // è¶…过9999则重置为0001
        } else {
            serialSuffix = "0001"; // å½“年无记录则初始化
        }

        // èŽ·å–单位编码
        String unitCode = sysDictService.queryDictTextByKey("unit_code", code);

        // æ‹¼æŽ¥å®Œæ•´ç¼–号
        return yearSuffix + unitCode + user.getUsername() + serialSuffix;
    }
}

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

@@ -9,6 +9,7 @@
import org.apache.commons.collections4.ListUtils;
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.ComponentInfoMapper;
@@ -83,7 +84,7 @@
            ExceptionCast.cast(PartsInfoCode.PARTS_COMPONENT_NONE);
        partsInfo.setPartsStatus(1);
        boolean b = super.save(partsInfo);
        List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),"2","1");
        List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(componentInfo.getComponentId(),DocAttributionTypeEnum.COMPONENT.getCode().toString(),"1");
        if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
            List<PartsDepartment> partsDepartmentList = new ArrayList<>();
            List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
@@ -95,7 +96,7 @@
                PermissionStreamNew perm = new PermissionStreamNew();
                perm.setDepartId(item.getDepartId());
                perm.setBusinessId(partsInfo.getPartsId());
                perm.setBusinessType("3");
                perm.setBusinessType(DocAttributionTypeEnum.PARTS.getCode().toString());
                permissionStreamList.add(perm);
            });
            if(!partsDepartmentList.isEmpty()) {
@@ -111,18 +112,18 @@
        }
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = productPermissionService.add(partsInfo.getPartsId(), userId,"3");
        b = productPermissionService.add(partsInfo.getPartsId(), userId,DocAttributionTypeEnum.PARTS.getCode().toString());
        if (!b) {
            ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
        }
        //添加结构树
        ProductMix productMix = new ProductMix(Long.parseLong(partsInfo.getPartsId()),Long.parseLong(partsInfo.getComponentId())
                ,partsInfo.getPartsName(),partsInfo.getPartsCode(),3,new Date());
                ,partsInfo.getPartsName(),partsInfo.getPartsCode(),DocAttributionTypeEnum.PARTS.getCode(),new Date());
        productMixService.save(productMix);
        //添加用户权限
        PermissionStreamNew stream = new PermissionStreamNew();
        stream.setBusinessId(partsInfo.getPartsId());
        stream.setBusinessType("3");
        stream.setBusinessType(DocAttributionTypeEnum.PARTS.getCode().toString());
        stream.setUserId(userId);
        return permissionStreamNewService.addPermissionStreamNew(stream);
    }
@@ -160,11 +161,11 @@
            if(!b)
                return false;
        }
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId( id, userId,"3");
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId( id, userId,DocAttributionTypeEnum.PARTS.getCode().toString());
        if(stream == null) {
            stream = new PermissionStreamNew();
            stream.setBusinessId(id);
            stream.setBusinessType("3");
            stream.setBusinessType(DocAttributionTypeEnum.PARTS.getCode().toString());
            stream.setUserId(userId);
            return permissionStreamNewService.save(stream);
        }
@@ -222,10 +223,10 @@
            b = partsDepartmentService.deleteByPartsId(item.getPartsId());
            if(!b)
                ExceptionCast.cast(PartsInfoCode.PARTS_DELETE_ERROR);
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getPartsId(),"3","0");
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getPartsId(),DocAttributionTypeEnum.PARTS.getCode().toString(),"0");
            if(!b)
                ExceptionCast.cast(PartsInfoCode.PARTS_DELETE_ERROR);
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getPartsId(),"3","1");
            b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(item.getPartsId(),DocAttributionTypeEnum.PARTS.getCode().toString(),"1");
            if(!b)
                ExceptionCast.cast(PartsInfoCode.PARTS_DELETE_ERROR);
            b = super.removeById(item.getPartsId());
@@ -248,7 +249,7 @@
            ExceptionCast.cast(PartsInfoCode.PARTS_PROCESS_EXIST);
        boolean b = partsPermissionService.deleteByPartsId(partsInfo.getPartsId());
        //验证是否存在文档
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","3").eq("attribution_id",partsId));
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type",DocAttributionTypeEnum.PARTS.getCode().toString()).eq("attribution_id",partsId));
        if (!docRelativeList.isEmpty()){
            ExceptionCast.cast(PartsInfoCode.PARTS_DOC_EXIST);
        }
@@ -257,10 +258,10 @@
        b = partsDepartmentService.deleteByPartsId(partsInfo.getPartsId());
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(partsId,"3","0");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(partsId,DocAttributionTypeEnum.PARTS.getCode().toString(),"0");
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(partsId,"3","1");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(partsId,DocAttributionTypeEnum.PARTS.getCode().toString(),"1");
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = productMixService.removeById(partsId);
@@ -284,12 +285,12 @@
                en.setPartsId(partsInfo.getPartsId());
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), item.getId(),"3");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), item.getId(),DocAttributionTypeEnum.PARTS.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setUserId(item.getId());
                stream.setBusinessId(partsInfo.getPartsId());
                stream.setBusinessType("3");
                stream.setBusinessType(DocAttributionTypeEnum.PARTS.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -320,7 +321,7 @@
            if(en != null) {
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), item.getId(),"3");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), item.getId(),DocAttributionTypeEnum.PARTS.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -356,12 +357,12 @@
                en.setPartsId(partsInfo.getPartsId());
                partsDepartments.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(partsInfo.getPartsId(), item.getId(),"3");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(partsInfo.getPartsId(), item.getId(),DocAttributionTypeEnum.PARTS.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setDepartId(item.getId());
                stream.setBusinessId(partsInfo.getPartsId());
                stream.setBusinessType("3");
                stream.setBusinessType(DocAttributionTypeEnum.PARTS.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -392,7 +393,7 @@
            if(en != null) {
                partsDepartments.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(partsInfo.getPartsId(), item.getId(),"3");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(partsInfo.getPartsId(), item.getId(),DocAttributionTypeEnum.PARTS.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -458,7 +459,7 @@
        if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
            queryWrapper.in(PartsInfo::getComponentId, treeInfoRequest.getComponentIds());
        }
        if (treeInfoRequest.getAttributionType()==3){
        if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PARTS.getCode())){
            queryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),PartsInfo::getPartsId,treeInfoRequest.getAttributionId());
        }
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),PartsInfo::getPartsCode, treeInfoRequest.getTreeCode());
@@ -473,12 +474,12 @@
            BeanUtil.copyProperties(treeInfoRequest,docQuery);
            docQuery.setAttributionIds(ids);
            docQuery.setDocClassCode("OTHER");
            docQuery.setAttributionType(3);
            docQuery.setAttributionType(DocAttributionTypeEnum.PARTS.getCode());
            docInfos=docInfoService.findListByDocQuery(docQuery);
        }
        if (treeInfoRequest.getAttributionType()==3){
        if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PARTS.getCode())){
            List<String> id =new ArrayList<>();
            id.add(treeInfoRequest.getAttributionIds());
            id.add(treeInfoRequest.getAttributionId());
            treeInfoRequest.setPartsIds(id);
            List<DocInfo> processSpecVersions = processSpecVersionService.getByProcessSpecVersion(treeInfoRequest);
            docInfos.addAll(processSpecVersions);

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

@@ -8,6 +8,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
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.ComponentInfoMapper;
@@ -35,7 +36,7 @@
    @Autowired
    private ComponentInfoMapper componentInfoMapper;
    @Autowired
    private PartsInfoMapper processSpecVersionMapper;
    private PartsInfoMapper partsInfoMapper;
    @Autowired
    private IPermissionStreamNewService permissionStreamNewService;
    @Autowired
@@ -90,56 +91,65 @@

    /**
     * æ–°å¢žå·¥è‰ºè§„程版本表信息
     * @param ProcessSpecVersion
     * @param processSpecVersion
     * @return
     */
    @Override
    public boolean addProcessSpecVersion(ProcessSpecVersion ProcessSpecVersion){
        if(ProcessSpecVersion == null)
    public boolean addProcessSpecVersion(ProcessSpecVersion processSpecVersion){
        if(processSpecVersion == null)
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        if(!ValidateUtil.validateString(ProcessSpecVersion.getProcessSpecVersionName()))
        if(!ValidateUtil.validateString(processSpecVersion.getProcessSpecVersionName()))
            ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_NONE);
        if(!ValidateUtil.validateString(ProcessSpecVersion.getProductId()))
        if(!ValidateUtil.validateString(processSpecVersion.getProductId()))
            ExceptionCast.cast(PartsInfoCode.PARTS_PRODUCT_NONE);
        if(!ValidateUtil.validateString(ProcessSpecVersion.getComponentId()))
        if(!ValidateUtil.validateString(processSpecVersion.getComponentId()))
            ExceptionCast.cast(PartsInfoCode.PARTS_COMPONENT_NONE);
        if(!ValidateUtil.validateString(ProcessSpecVersion.getPartsId()))
        if(!ValidateUtil.validateString(processSpecVersion.getPartsId()))
            ExceptionCast.cast(ProcessInfoCode.PROCESS_PARTS_NONE);
        if(!ValidateUtil.validateString(ProcessSpecVersion.getProcessSpecVersionCode()))
        if(!ValidateUtil.validateString(processSpecVersion.getProcessSpecVersionCode()))
            ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_CODE_NONE);
        ProcessSpecVersion en = getByCode(ProcessSpecVersion.getPartsId(),ProcessSpecVersion.getProcessSpecVersionCode());
        ProcessSpecVersion en = getByCode(processSpecVersion.getPartsId(),processSpecVersion.getProcessSpecVersionCode());
        if(en != null)
            ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_IS_EXIST);
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = user.getId();
        if(!ValidateUtil.validateString(userId))
            ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
        ProductInfo productInfo = productInfoMapper.selectById(ProcessSpecVersion.getProductId());
        ProductInfo productInfo = productInfoMapper.selectById(processSpecVersion.getProductId());
        if(productInfo == null)
            ExceptionCast.cast(PartsInfoCode.PARTS_PRODUCT_NONE);
        ComponentInfo componentInfo = componentInfoMapper.selectById(ProcessSpecVersion.getComponentId());
        ComponentInfo componentInfo = componentInfoMapper.selectById(processSpecVersion.getComponentId());
        if(componentInfo == null)
            ExceptionCast.cast(PartsInfoCode.PARTS_COMPONENT_NONE);
        PartsInfo processSpecVersion = processSpecVersionMapper.selectById(ProcessSpecVersion.getPartsId());
        if(processSpecVersion == null)
        PartsInfo partsInfo = partsInfoMapper.selectById(processSpecVersion.getPartsId());
        if(partsInfo == null)
            ExceptionCast.cast(PartsInfoCode.PARTS_NOT_EXIST);
        boolean b = super.save(ProcessSpecVersion);
        //相同零件号下面版本号不能重复
        List<ProcessSpecVersion> list = super.list(new LambdaQueryWrapper<ProcessSpecVersion>().eq(ProcessSpecVersion::getPartsId,partsInfo.getPartsId()));
        if (list != null && list.size() > 0) {
            list.forEach(processSpecVersion1 -> {
                if (processSpecVersion1.getProcessSpecVersionCode().equals(processSpecVersion.getProcessSpecVersionCode())) {
                    ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_IS_EXIST);
                }
            });
        }
        boolean b = super.save(processSpecVersion);
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        //添加部门权限
        List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(ProcessSpecVersion.getPartsId(),"3","1");
        List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(processSpecVersion.getPartsId(), DocAttributionTypeEnum.PARTS.getCode().toString(),"1");
        if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
            List<ProcessSpecVersionDepartment> processSpecVersionDepartmentList = new ArrayList<>();
            List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
            oldDepartPermList.forEach(item -> {
                ProcessSpecVersionDepartment pd = new ProcessSpecVersionDepartment();
                pd.setDepartId(item.getDepartId());
                pd.setPsvId(ProcessSpecVersion.getId());
                pd.setPsvId(processSpecVersion.getId());
                processSpecVersionDepartmentList.add(pd);
                PermissionStreamNew perm = new PermissionStreamNew();
                perm.setDepartId(item.getDepartId());
                perm.setBusinessId(ProcessSpecVersion.getId());
                perm.setBusinessType("4");
                perm.setBusinessId(processSpecVersion.getId());
                perm.setBusinessType(DocAttributionTypeEnum.OPERATION.getCode().toString());
                permissionStreamList.add(perm);
            });
            if(!processSpecVersionDepartmentList.isEmpty()) {
@@ -154,19 +164,19 @@
            }
        }
        //添加用户权限
        b = productPermissionService.add(ProcessSpecVersion.getId(), userId,"4");
        b = productPermissionService.add(processSpecVersion.getId(), userId,DocAttributionTypeEnum.OPERATION.getCode().toString());
        if (!b) {
            ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
        }
        //添加结构树
        ProductMix productMix = new ProductMix(Long.parseLong(ProcessSpecVersion.getId()),Long.parseLong(ProcessSpecVersion.getPartsId())
                ,ProcessSpecVersion.getProcessSpecVersionName(),
                ProcessSpecVersion.getProcessSpecVersionCode(),4,new Date());
        ProductMix productMix = new ProductMix(Long.parseLong(processSpecVersion.getId()),Long.parseLong(processSpecVersion.getPartsId())
                ,processSpecVersion.getProcessSpecVersionName(),
                processSpecVersion.getProcessSpecVersionCode(),DocAttributionTypeEnum.OPERATION.getCode(),new Date());
        productMixService.save(productMix);
        //添加用户权限
        PermissionStreamNew stream = new PermissionStreamNew();
        stream.setBusinessId(ProcessSpecVersion.getId());
        stream.setBusinessType("4");
        stream.setBusinessId(processSpecVersion.getId());
        stream.setBusinessType(DocAttributionTypeEnum.OPERATION.getCode().toString());
        stream.setUserId(userId);
        return permissionStreamNewService.addPermissionStreamNew(stream);
    }
@@ -207,7 +217,7 @@
            if(!b)
                return false;
        }
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId,"4");
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId,DocAttributionTypeEnum.OPERATION.getCode().toString());
        if(stream == null) {
            stream = new PermissionStreamNew();
            stream.setBusinessId(id);
@@ -238,10 +248,10 @@
        b = processSpecVersionDepartmentService.deleteByPsvId(processSpecVersion.getId());
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(processSpecVersion.getId(),"4","0");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(processSpecVersion.getId(),DocAttributionTypeEnum.OPERATION.getCode().toString(),"0");
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(processSpecVersion.getId(),"4","1");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(processSpecVersion.getId(),DocAttributionTypeEnum.OPERATION.getCode().toString(),"1");
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = productMixService.removeById(processSpecVersion.getId());
@@ -311,12 +321,12 @@
                en.setPsvId(processSpecVersion.getId());
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processSpecVersion.getId(), item.getId(),"4");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processSpecVersion.getId(), item.getId(),DocAttributionTypeEnum.OPERATION.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setUserId(item.getId());
                stream.setBusinessId(processSpecVersion.getId());
                stream.setBusinessType("4");
                stream.setBusinessType(DocAttributionTypeEnum.OPERATION.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -353,7 +363,7 @@
            if(en != null) {
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processSpecVersion.getId(), item.getId(),"4");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processSpecVersion.getId(), item.getId(),DocAttributionTypeEnum.OPERATION.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -393,12 +403,12 @@
                en.setPsvId(processSpecVersion.getId());
                partsDepartments.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processSpecVersion.getId(), item.getId(),"4");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(processSpecVersion.getId(), item.getId(),DocAttributionTypeEnum.OPERATION.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setDepartId(item.getId());
                stream.setBusinessId(processSpecVersion.getId());
                stream.setBusinessType("4");
                stream.setBusinessType(DocAttributionTypeEnum.OPERATION.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -483,13 +493,14 @@
        if (treeInfoRequest.getPartsIds() != null && !treeInfoRequest.getPartsIds().isEmpty()) {
            queryWrapper.in(ProcessSpecVersion::getPartsId, treeInfoRequest.getPartsIds());
        }
        if (treeInfoRequest.getAttributionType()==4){
        if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.OPERATION.getCode())){
            queryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),ProcessSpecVersion::getId,treeInfoRequest.getAttributionId());
        }
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),ProcessSpecVersion::getProcessSpecVersionName, treeInfoRequest.getTreeName());
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),ProcessSpecVersion::getProcessSpecVersionCode, treeInfoRequest.getTreeName());
        queryWrapper.orderByDesc(ProcessSpecVersion::getCreateTime);
        List<ProcessSpecVersion> list = super.list(queryWrapper);
        List<DocInfo> docInfos;
        if (list == null || list.isEmpty() || StrUtil.isNotBlank(treeInfoRequest.getStructureType())){
            return new ArrayList<>();
        }else {
@@ -498,8 +509,16 @@
            BeanUtil.copyProperties(treeInfoRequest,docQuery);
            docQuery.setAttributionIds(ids);
            docQuery.setDocClassCode("OTHER");
            docQuery.setAttributionType(4);
            return docInfoService.findListByDocQuery(docQuery);
            docQuery.setAttributionType(DocAttributionTypeEnum.OPERATION.getCode());
            docInfos=docInfoService.findListByDocQuery(docQuery);
            if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.OPERATION.getCode())){
                List<String> id =new ArrayList<>();
                id.add(treeInfoRequest.getAttributionId());
                treeInfoRequest.setPsvIds(id);
                List<DocInfo> processSpecVersions = processStreamService.getByProcessStreamOtherFile(treeInfoRequest);
                docInfos.addAll(processSpecVersions);
        }
    }
        return docInfos;
    }
}

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

@@ -1,5 +1,7 @@
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;
@@ -7,10 +9,13 @@
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;
@@ -22,6 +27,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;

@Service
public class ProcessStreamServiceImpl extends ServiceImpl<ProcessStreamMapper, ProcessStream> implements IProcessStreamService {
@@ -49,6 +55,11 @@
    private IProductMixService productMixService;
    @Autowired
    private IProductPermissionService productPermissionService;
    @Autowired
    @Lazy
    private IDocInfoService docInfoService;
    @Autowired
    private IDeviceTypeService deviceTypeService;

    @Override
    @Transactional(rollbackFor = {Exception.class})
@@ -80,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)
@@ -92,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)
@@ -109,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()) {
@@ -124,7 +135,7 @@
            }
        }
        //添加用户权限
        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);
        }
@@ -132,17 +143,17 @@
        ProductMix productMix;
        if (stream.getPsvId() != null) {
            productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getPsvId())
                    ,stream.getProcessName(),stream.getProcessCode(),5,new Date());
                    ,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(),5,new Date());
                    ,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");
        permissionStream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
        return permissionStreamNewService.addPermissionStreamNew(permissionStream);
    }

@@ -190,7 +201,7 @@
            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);
        }
@@ -305,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);
            }
        });
@@ -352,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);
            }
@@ -387,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);
            }
        });
@@ -423,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);
            }
@@ -444,4 +455,109 @@
        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> processSpecVersions = workStepService.getByWorkStepOtherFile(treeInfoRequest);
                docInfos.addAll(processSpecVersions);
            }
        }
        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> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
                DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
                BeanUtil.copyProperties(treeInfoRequest,docQuery);
                docQuery.setAttributionIds(String.join(",",deviceManagementIds));
                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);
            }
            return docInfos;
        }
        return null;
    }

}

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

@@ -11,6 +11,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.constant.DocAttributionTypeEnum;
import org.jeecg.modules.dnc.dto.ComponentExt;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
@@ -87,6 +88,10 @@
    @Autowired
    @Lazy
    private IDocInfoService docInfoService;
    @Autowired
    private IDeviceTypeService deviceTypeService;
    @Autowired
    private IDeviceManagementService deviceManagementService;

    @Override
    @Transactional(rollbackFor = {Exception.class})
@@ -130,7 +135,7 @@
                PermissionStreamNew stream = new PermissionStreamNew();
                stream.setBusinessId(productInfo.getProductId());
                stream.setDepartId(departId);
                stream.setBusinessType("1");
                stream.setBusinessType(DocAttributionTypeEnum.PRODUCT.getCode().toString());
                permissionStreamNewService.save(stream);
            }
        }
@@ -138,7 +143,7 @@
        PermissionStreamNew stream = new PermissionStreamNew();
        stream.setBusinessId(productInfo.getProductId());
        stream.setUserId(userId);
        stream.setBusinessType("1");
        stream.setBusinessType(DocAttributionTypeEnum.PRODUCT.getCode().toString());
        return permissionStreamNewService.addPermissionStreamNew(stream);
    }

@@ -174,12 +179,12 @@
                return false;
            }
        }
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId, "1");
        PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(id, userId, DocAttributionTypeEnum.PRODUCT.getCode().toString());
        if (stream == null) {
            stream = new PermissionStreamNew();
            stream.setBusinessId(productInfo.getProductId());
            stream.setUserId(userId);
            stream.setBusinessType("1");
            stream.setBusinessType(DocAttributionTypeEnum.PRODUCT.getCode().toString());
            return permissionStreamNewService.save(stream);
        }
        return b;
@@ -258,7 +263,7 @@
            ExceptionCast.cast(ProductInfoCode.PRODUCT_PROCESS_EXIST);
        boolean b = productPermissionService.deleteByProductId(id);
        //验证是否存在文档
        List<DocRelative> docRelativeList = iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type", "1").eq("attribution_id", id));
        List<DocRelative> docRelativeList = iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type", DocAttributionTypeEnum.PRODUCT.getCode() ).eq("attribution_id", id));
        if (!docRelativeList.isEmpty()) {
            ExceptionCast.cast(ProductInfoCode.PRODUCT_DOC_EXIST);
        }
@@ -267,10 +272,10 @@
        b = productDepartmentService.deleteByProductId(id);
        if (!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(id, "1","0");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(id, DocAttributionTypeEnum.PRODUCT.getCode().toString(),"0");
        if (!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(id, "1","1");
        b = permissionStreamNewService.deletePermissionStreamNewByBusinessId(id, DocAttributionTypeEnum.PRODUCT.getCode().toString(),"1");
        if (!b)
            ExceptionCast.cast(CommonCode.FAIL);
        b = productMixService.removeById(id);
@@ -287,37 +292,37 @@
        String userId = user.getId();
        if (!ValidateUtil.validateString(userId))
            ExceptionCast.cast(UcenterCode.UCENTER_ACCOUNT_NOT_EXIST);
        if (nodeType == 1) {
        if (nodeType.equals(DocAttributionTypeEnum.PRODUCT.getCode())) {
            ProductInfo productInfo = super.getById(paramId);
            if (productInfo == null)
                ExceptionCast.cast(ProductInfoCode.PRODUCT_NOT_EXIST);
            PermissionStreamNew permission = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(paramId, userId,"1");
            return permission != null;
        } else if (nodeType == 2) {
        } else if (nodeType.equals(DocAttributionTypeEnum.COMPONENT.getCode())) {
            ComponentInfo componentInfo = componentInfoService.getById(paramId);
            if (componentInfo == null)
                ExceptionCast.cast(ComponentInfoCode.COMPONENT_NOT_EXIST);
            PermissionStreamNew permission = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(componentInfo.getComponentId(), userId,"2");
            return permission != null;
        } else if (nodeType == 3) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PARTS.getCode())) {
            PartsInfo partsInfo = partsInfoService.getById(paramId);
            if (partsInfo == null)
                ExceptionCast.cast(PartsInfoCode.PARTS_NOT_EXIST);
            PermissionStreamNew permission = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(partsInfo.getPartsId(), userId, "3");
            return permission != null;
        } else if (nodeType == 4) {
        } else if (nodeType.equals(DocAttributionTypeEnum.OPERATION.getCode())) {
            ProcessSpecVersion processSpecVersion = processSpecVersionService.getById(paramId);
            if (processSpecVersion == null)
                ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_NOT_EXIST);
            PermissionStreamNew permission = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processSpecVersion.getId(),userId,"4");
            return permission != null;
        } else if (nodeType == 5) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PROCESS.getCode())) {
            ProcessStream processStream = processStreamService.getById(paramId);
            if (processStream == null)
                ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
            PermissionStreamNew permission = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(processStream.getProcessId(), userId,"5");
            return permission != null;
        } else if (nodeType == 6) {
        } else if (nodeType.equals(DocAttributionTypeEnum.WORKSITE.getCode())) {
            WorkStep workStep = workStepService.getById(paramId);
            if (workStep == null)
                ExceptionCast.cast(ProcessInfoCode.WORKSTEP_NOT_EXIST);
@@ -331,17 +336,17 @@
    public List<UserDepartExt> getUserPermsList(Integer nodeType, String paramId) {
        if (!ValidateUtil.validateInteger(nodeType) || !ValidateUtil.validateString(paramId))
            return null;
        if (nodeType == 1) {
        if (nodeType.equals(DocAttributionTypeEnum.PRODUCT.getCode())) {
            return productPermissionService.getUserPermsByProductId(paramId);
        } else if (nodeType == 2) {
        } else if (nodeType.equals(DocAttributionTypeEnum.COMPONENT.getCode())) {
            return componentPermissionService.getUserPermsByComponentId(paramId);
        } else if (nodeType == 3) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PARTS.getCode())) {
            return partsPermissionService.getUserPermsByProductId(paramId);
        } else if (nodeType == 4) {
        } else if (nodeType.equals(DocAttributionTypeEnum.OPERATION.getCode())) {
            return processSpecVersionPermissionService.getUserPermsByProductId(paramId);
        } else if (nodeType == 5) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PROCESS.getCode())) {
            return iProcessStreamPermissionService.getUserPermsByProductId(paramId);
        } else if (nodeType == 6) {
        } else if (nodeType.equals(DocAttributionTypeEnum.WORKSITE.getCode())) {
            return iWorkStepPermissionService.getUserPermsByProductId(paramId);
        } else {
            return null;
@@ -352,17 +357,17 @@
    public List<SysUser> getUserNonPermsList(Integer nodeType, String paramId) {
        if (!ValidateUtil.validateInteger(nodeType) || !ValidateUtil.validateString(paramId))
            return null;
        if (nodeType == 1) {
        if (nodeType.equals(DocAttributionTypeEnum.PRODUCT.getCode())) {
            return productPermissionService.getUserNonPermsByProductId(paramId);
        } else if (nodeType == 2) {
        } else if (nodeType.equals(DocAttributionTypeEnum.COMPONENT.getCode())){
            return componentPermissionService.getUserNonPermsByComponentId(paramId);
        } else if (nodeType == 3) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PARTS.getCode())) {
            return partsPermissionService.getUserNonPermsByProductId(paramId);
        } else if (nodeType == 4) {
        } else if (nodeType.equals(DocAttributionTypeEnum.OPERATION.getCode())) {
            return processSpecVersionPermissionService.getUserNonPermsByProductId(paramId);
        } else if (nodeType == 5) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PROCESS.getCode())) {
            return iProcessStreamPermissionService.getUserNonPermsByProductId(paramId);
        } else if (nodeType == 6) {
        } else if (nodeType.equals(DocAttributionTypeEnum.WORKSITE.getCode())) {
            return iWorkStepPermissionService.getUserNonPermsByProductId(paramId);
        } else {
            return null;
@@ -373,17 +378,17 @@
    public List<MdcProduction> getDepartPermsList(Integer nodeType, String paramId) {
        if (!ValidateUtil.validateInteger(nodeType) || !ValidateUtil.validateString(paramId))
            return null;
        if (nodeType == 1) {
        if (nodeType.equals(DocAttributionTypeEnum.PRODUCT.getCode())) {
            return productDepartmentService.getDepartPermsByProductId(paramId);
        } else if (nodeType == 2) {
        } else if (nodeType.equals(DocAttributionTypeEnum.COMPONENT.getCode())){
            return componentDepartmentService.getDepartPermsByComponentId(paramId);
        } else if (nodeType == 3) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PARTS.getCode())) {
            return partsDepartmentService.getDepartPermsByPartsId(paramId);
        } else if (nodeType == 4) {
        } else if (nodeType.equals(DocAttributionTypeEnum.OPERATION.getCode())) {
            return processSpecVersionDepartmentService.getDepartPermsByPsvId(paramId);
        }else if (nodeType == 5) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PROCESS.getCode())) {
            return processionDepartmentService.getDepartPermsByProcessId(paramId);
        } else if (nodeType == 6) {
        } else if (nodeType.equals(DocAttributionTypeEnum.WORKSITE.getCode())) {
            return workStepDepartmentService.getDepartPermsByStepId(paramId);
        }
        else {
@@ -395,17 +400,17 @@
    public List<MdcProduction> getDepartNonPermsList(Integer nodeType, String paramId) {
        if (!ValidateUtil.validateInteger(nodeType) || !ValidateUtil.validateString(paramId))
            return null;
        if (nodeType == 1) {
        if (nodeType.equals(DocAttributionTypeEnum.PRODUCT.getCode())) {
            return productDepartmentService.getDepartNonPermsByProductId(paramId);
        } else if (nodeType == 2) {
        } else if (nodeType.equals(DocAttributionTypeEnum.COMPONENT.getCode())){
            return componentDepartmentService.getDepartNonPermsByComponentId(paramId);
        } else if (nodeType == 3) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PARTS.getCode())) {
            return partsDepartmentService.getDepartNonPermsByProductId(paramId);
        } else if (nodeType == 4) {
        } else if (nodeType.equals(DocAttributionTypeEnum.OPERATION.getCode())) {
            return processionDepartmentService.getDepartNonPermsByProcessId(paramId);
        } else if (nodeType == 5) {
        } else if (nodeType.equals(DocAttributionTypeEnum.PROCESS.getCode())) {
            return processionDepartmentService.getDepartNonPermsByProcessId(paramId);
        } else if (nodeType == 6) {
        } else if (nodeType.equals(DocAttributionTypeEnum.WORKSITE.getCode())) {
            return workStepDepartmentService.getDepartNonPermsByStepId(paramId);
        } else {
            return null;
@@ -570,7 +575,7 @@
                stream = new PermissionStreamNew();
                stream.setUserId(item.getId());
                stream.setBusinessId(productInfo.getProductId());
                stream.setBusinessType("1");
                stream.setBusinessType(DocAttributionTypeEnum.PRODUCT.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -645,7 +650,7 @@
                stream = new PermissionStreamNew();
                stream.setDepartId(item.getId());
                stream.setBusinessId(productInfo.getProductId());
                stream.setBusinessType("1");
                stream.setBusinessType(DocAttributionTypeEnum.PRODUCT.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -700,7 +705,7 @@
    public List<String> getDepartIdsByParams(Integer nodeType, String paramId) {
        List<String> departIds = new ArrayList<>();
        //5-工序
        if (nodeType == 5) {
        if (Objects.equals(nodeType, DocAttributionTypeEnum.PROCESS.getCode())) {
            ProcessStream processStream = processStreamService.getById(paramId);
            if (processStream == null)
                return null;
@@ -711,7 +716,7 @@
                departIds.add(item.getDepartId());
            });
            //6-工步
        } else if (nodeType == 6) {
        } else if (Objects.equals(nodeType, DocAttributionTypeEnum.WORKSITE.getCode())) {
            WorkStep workStep = workStepService.getById(paramId);
            if (workStep == null)
                return null;
@@ -755,7 +760,7 @@

    @Override
    public List<CommonGenericTree> loadTree(String userId, Integer nodeType, String paramId) {
        if (nodeType == 1) {
        if (Objects.equals(nodeType, DocAttributionTypeEnum.PRODUCT.getCode())) {
            List<ComponentInfo> componentInfoList = componentInfoService.getByProductIdAndUserId(paramId, userId);
            if (componentInfoList == null || componentInfoList.isEmpty())
                return Collections.emptyList();
@@ -768,13 +773,13 @@
                node.setLabel(c.getComponentName());
                node.setParentId(c.getProductId());
                node.setIconClass("");
                node.setType(2);
                node.setType(DocAttributionTypeEnum.COMPONENT.getCode());
                node.setRField(c.getProductId());
                node.setEntity(c);
                list.add(node);
            }
            return list;
        } else if (nodeType == 2) {
        } else if (Objects.equals(nodeType, DocAttributionTypeEnum.COMPONENT.getCode())) {
            List<ComponentInfo> componentInfoList = componentInfoService.getByParentIdAndUserId(paramId, userId);
            List<CommonGenericTree> list = new ArrayList<>();
            CommonGenericTree<ComponentInfo> componentNode;
@@ -786,7 +791,7 @@
                    componentNode.setLabel(c.getComponentName());
                    componentNode.setParentId(c.getParentId());
                    componentNode.setIconClass("");
                    componentNode.setType(2);
                    componentNode.setType(DocAttributionTypeEnum.COMPONENT.getCode());
                    componentNode.setRField(c.getProductId());
                    componentNode.setEntity(c);
                    list.add(componentNode);
@@ -803,7 +808,7 @@
                partNode.setLabel(part.getPartsName());
                partNode.setParentId(part.getComponentId());
                partNode.setIconClass("");
                partNode.setType(3);
                partNode.setType(DocAttributionTypeEnum.PARTS.getCode());
                partNode.setRField(part.getComponentId());
                partNode.setEntity(part);
                partNode.setLeaf(true);
@@ -1071,6 +1076,98 @@
                return getByTreeOtherFileInfo(partsInfoService.getByPartsInfo(treeInfoRequest));
            case 4:
                return getByTreeOtherFileInfo(processSpecVersionService.getByProcessSpecVersion(treeInfoRequest));
            case 5:
                return getByTreeOtherFileInfo(processStreamService.getByProcessStreamOtherFile(treeInfoRequest));
            case 6:
                return getByTreeOtherFileInfo(workStepService.getByWorkStepOtherFile(treeInfoRequest));
        }
        return new ArrayList<>();
    }

    /**
     * é€šè¿‡ä»£å·ã€åç§°ã€æè´¨ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * @param treeInfoRequest
     * @return
     */
    @Override
    public List<DocInfo> getByTreeNcFileInfo(TreeInfoRequest treeInfoRequest){
        //产品、部件、零件、工艺规程版本都没有对应的NC文件，直接查询子结构
        switch (treeInfoRequest.getAttributionType()){
            case 1:
                LambdaQueryWrapper<ProductInfo> queryWrapper = new LambdaQueryWrapper<>();
                // æ˜Žç¡®æ¡ä»¶ï¼šä»…当attributionType为1且attributionId非空时添加条件
                if (StrUtil.isNotBlank(treeInfoRequest.getAttributionId())) {
                    queryWrapper.eq(ProductInfo::getProductId, treeInfoRequest.getAttributionId());
                }
                // ç®€åŒ–条件判断
                queryWrapper.like(StrUtil.isNotBlank(treeInfoRequest.getTreeCode()), ProductInfo::getProductNo, treeInfoRequest.getTreeCode())
                        .like(StrUtil.isNotBlank(treeInfoRequest.getTreeName()), ProductInfo::getProductName, treeInfoRequest.getTreeName());
                List<ProductInfo> productInfoList = super.list(queryWrapper);
                if (CollectionUtil.isNotEmpty(productInfoList)) {
                    treeInfoRequest.setProductIds(productInfoList.stream().map(ProductInfo::getProductId).collect(Collectors.toList()));
                }
                return getByTreeNcFileInfo(processStreamService.getByProcessStreamNCFile(treeInfoRequest));
            case 2:
                LambdaQueryWrapper<ComponentInfo> componentInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
                // æ˜Žç¡®æ¡ä»¶ï¼šä»…当attributionType为1且attributionId非空时添加条件
                if (StrUtil.isNotBlank(treeInfoRequest.getAttributionId())) {
                    componentInfoLambdaQueryWrapper.eq(ComponentInfo::getComponentId, treeInfoRequest.getAttributionId());
                }
                componentInfoLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),ComponentInfo::getComponentCode, treeInfoRequest.getTreeCode());
                componentInfoLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),ComponentInfo::getComponentName, treeInfoRequest.getTreeName());
                componentInfoLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getStructureType()),ComponentInfo::getStructureType, treeInfoRequest.getStructureType());
                componentInfoLambdaQueryWrapper.orderByDesc(ComponentInfo::getCreateTime);
                List<ComponentInfo> componentInfoList = componentInfoService.list(componentInfoLambdaQueryWrapper);
                if (CollectionUtil.isNotEmpty(componentInfoList)) {
                    treeInfoRequest.setComponentIds(componentInfoList.stream().map(ComponentInfo::getComponentId).collect(Collectors.toList()));
                }
                return getByTreeNcFileInfo(processStreamService.getByProcessStreamNCFile(treeInfoRequest));
            case 3:
                LambdaQueryWrapper<PartsInfo> partsInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
                if (treeInfoRequest.getProductIds() != null && !treeInfoRequest.getProductIds().isEmpty()) {
                    partsInfoLambdaQueryWrapper.in(PartsInfo::getProductId, treeInfoRequest.getProductIds());
                }
                if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
                    partsInfoLambdaQueryWrapper.in(PartsInfo::getComponentId, treeInfoRequest.getComponentIds());
                }
                if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.PARTS.getCode())){
                    partsInfoLambdaQueryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),PartsInfo::getPartsId,treeInfoRequest.getAttributionId());
                }
                partsInfoLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),PartsInfo::getPartsCode, treeInfoRequest.getTreeCode());
                partsInfoLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),PartsInfo::getPartsName, treeInfoRequest.getTreeName());
                partsInfoLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getStructureType()),PartsInfo::getStructureType, treeInfoRequest.getStructureType());
                partsInfoLambdaQueryWrapper.orderByDesc(PartsInfo::getCreateTime);
                List<PartsInfo> list = partsInfoService.list(partsInfoLambdaQueryWrapper);
                if (CollectionUtil.isNotEmpty(list)) {
                    treeInfoRequest.setPartsIds(list.stream().map(PartsInfo::getPartsId).collect(Collectors.toList()));
                }
                return getByTreeNcFileInfo(processStreamService.getByProcessStreamNCFile(treeInfoRequest));
            case 4:
                LambdaQueryWrapper<ProcessSpecVersion> processSpecVersionLambdaQueryWrapper = new LambdaQueryWrapper<>();
                if (treeInfoRequest.getProductIds() != null && !treeInfoRequest.getProductIds().isEmpty()) {
                    processSpecVersionLambdaQueryWrapper.in(ProcessSpecVersion::getProductId, treeInfoRequest.getProductIds());
                }
                if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
                    processSpecVersionLambdaQueryWrapper.in(ProcessSpecVersion::getComponentId, treeInfoRequest.getComponentIds());
                }
                if (treeInfoRequest.getPartsIds() != null && !treeInfoRequest.getPartsIds().isEmpty()) {
                    processSpecVersionLambdaQueryWrapper.in(ProcessSpecVersion::getPartsId, treeInfoRequest.getPartsIds());
                }
                if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.OPERATION.getCode())){
                    processSpecVersionLambdaQueryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),ProcessSpecVersion::getId,treeInfoRequest.getAttributionId());
                }
                processSpecVersionLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),ProcessSpecVersion::getProcessSpecVersionName, treeInfoRequest.getTreeName());
                processSpecVersionLambdaQueryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),ProcessSpecVersion::getProcessSpecVersionCode, treeInfoRequest.getTreeName());
                processSpecVersionLambdaQueryWrapper.orderByDesc(ProcessSpecVersion::getCreateTime);
                List<ProcessSpecVersion> processSpecVersions = processSpecVersionService.list(processSpecVersionLambdaQueryWrapper);
                if (CollectionUtil.isNotEmpty(processSpecVersions)) {
                    treeInfoRequest.setPsvIds(processSpecVersions.stream().map(ProcessSpecVersion::getId).collect(Collectors.toList()));
                }
                return getByTreeNcFileInfo(processStreamService.getByProcessStreamNCFile(treeInfoRequest));
            case 5:
                return getByTreeNcFileInfo(processStreamService.getByProcessStreamNCFile(treeInfoRequest));
            case 6:
                return getByTreeNcFileInfo(workStepService.getByWorkStepNCFile(treeInfoRequest));
        }
        return new ArrayList<>();
    }
@@ -1099,6 +1196,42 @@
                        ProcessSpecVersion processSpecVersion=processSpecVersionService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(processSpecVersion.getProcessSpecVersionName());
                        docInfo.setNodeCode(processSpecVersion.getProcessSpecVersionCode());
                        break;
                    case 5:
                        ProcessStream processStream=processStreamService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(processStream.getProcessName());
                        docInfo.setNodeCode(processStream.getProcessCode());
                        break;
                    case 6:
                        WorkStep workStep=workStepService.getById(docInfo.getAttributionId());
                        docInfo.setNodeName(workStep.getStepName());
                        docInfo.setNodeCode(workStep.getStepName());
                        break;
                }
            });
        }
        return docInfos;
    }

    private List<DocInfo> getByTreeNcFileInfo(List<DocInfo> docInfos){
        //对所属id进行翻译
        if (docInfos != null && !docInfos.isEmpty()) {
            docInfos.forEach(docInfo -> {
                //NC文件存在设备类下
                DeviceType deviceType=deviceTypeService.getById(docInfo.getAttributionId());
                DeviceManagement deviceManagement= deviceManagementService.getById(deviceType.getDeviceManagementId());
                docInfo.setDeviceName(deviceManagement.getDeviceManagementName());
                docInfo.setDeviceCode(deviceManagement.getDeviceManagementCode());
                if (deviceType.getAttributionType().equals(DocAttributionTypeEnum.PROCESS.getCode())){
                    //工序下的设备类
                    ProcessStream processStream=processStreamService.getById(deviceType.getAttributionId());
                    docInfo.setNodeName(processStream.getProcessName());
                    docInfo.setNodeCode(processStream.getProcessCode());
                }else {
                    //工步下的设备类
                    WorkStep workStep=workStepService.getById(deviceType.getAttributionId());
                    docInfo.setNodeName(workStep.getStepName());
                    docInfo.setNodeCode(workStep.getStepName());
                }
            });
        }
@@ -1256,7 +1389,7 @@
            ComponentInfo cpInfo = componentInfoMap.get(cp.getComponentId());
            PermissionStreamNew s = new PermissionStreamNew();
            s.setBusinessId(cpInfo.getComponentId());
            s.setBusinessType("2");
            s.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
            s.setUserId(cp.getUserId());
            permissionStreamList.add(s);
        }
@@ -1287,7 +1420,7 @@
            PartsInfo ptInfo = partsInfoMap.get(pp.getPartsId());
            PermissionStreamNew s = new PermissionStreamNew();
            s.setBusinessId(ptInfo.getPartsId());
            s.setBusinessType("3");
            s.setBusinessType(DocAttributionTypeEnum.PARTS.getCode().toString());
            s.setUserId(pp.getUserId());
            permissionStreamList.add(s);
        }
@@ -1318,7 +1451,7 @@
            ProcessSpecVersion processSpecVersion = processStreamMap.get(pp.getPsvId());
            PermissionStreamNew s = new PermissionStreamNew();
            s.setBusinessId(processSpecVersion.getId());
            s.setBusinessType("4");
            s.setBusinessType(DocAttributionTypeEnum.OPERATION.getCode().toString());
            s.setUserId(pp.getUserId());
            permissionStreamList.add(s);
        }
@@ -1349,7 +1482,7 @@
            ProcessStream processStream = processStreamMap.get(pp.getProcessId());
            PermissionStreamNew s = new PermissionStreamNew();
            s.setBusinessId(processStream.getProcessId());
            s.setBusinessType("5");
            s.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
            s.setUserId(pp.getUserId());
            permissionStreamList.add(s);
        }
@@ -1380,7 +1513,7 @@
            WorkStep workStep = workStepHashMap.get(ws.getStepId());
            PermissionStreamNew s = new PermissionStreamNew();
            s.setBusinessId(workStep.getId());
            s.setBusinessType("6");
            s.setBusinessType(DocAttributionTypeEnum.WORKSITE.getCode().toString());
            s.setUserId(ws.getUserId());
            permissionStreamList.add(s);
        }
@@ -1608,7 +1741,7 @@
            WorkStep workStep = workStepMap.get(wsDep.getStepId());
            PermissionStreamNew permStream = new PermissionStreamNew();
            permStream.setBusinessId(workStep.getId());
            permStream.setBusinessType("6");
            permStream.setBusinessType(DocAttributionTypeEnum.WORKSITE.getCode().toString());
            permStream.setDepartId(wsDep.getDepartId());
            newPermissionStreams.add(permStream);
        }
@@ -1679,7 +1812,7 @@
            ProcessStream processStream = processStreamMap.get(procDep.getProcessId());
            PermissionStreamNew permStream = new PermissionStreamNew();
            permStream.setBusinessId(processStream.getProcessId());
            permStream.setBusinessType("5");
            permStream.setBusinessType(DocAttributionTypeEnum.PROCESS.getCode().toString());
            permStream.setDepartId(procDep.getDepartId());
            newPermissionStreams.add(permStream);
        }
@@ -1752,7 +1885,7 @@
            ComponentInfo componentInfo = componentInfoMap.get(compDep.getComponentId());
            PermissionStreamNew permStream = new PermissionStreamNew();
            permStream.setBusinessId(componentInfo.getComponentId());
            permStream.setBusinessType("2");
            permStream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
            permStream.setDepartId(compDep.getDepartId());
            newPermissionStreams.add(permStream);
        }
@@ -1826,7 +1959,7 @@
                childComponent = componentInfoMap.get(compDep.getComponentId());
                PermissionStreamNew permStream = new PermissionStreamNew();
                permStream.setBusinessId(childComponent.getComponentId());
                permStream.setBusinessType("2");
                permStream.setBusinessType(DocAttributionTypeEnum.COMPONENT.getCode().toString());
                permStream.setDepartId(compDep.getDepartId());
                newPermissionStreams.add(permStream);
            }

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

@@ -1,5 +1,7 @@
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;
@@ -7,9 +9,12 @@
import org.apache.commons.collections4.ListUtils;
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.WorkStepMapper;
import org.jeecg.modules.dnc.request.DocInfoQueryRequest;
import org.jeecg.modules.dnc.request.TreeInfoRequest;
import org.jeecg.modules.dnc.response.CommonCode;
import org.jeecg.modules.dnc.response.ProcessInfoCode;
import org.jeecg.modules.dnc.response.ProductInfoCode;
@@ -19,10 +24,12 @@
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;

/**
 * @Description: TODO
@@ -50,6 +57,12 @@

    @Autowired
    private IProductMixService productMixService;

    @Autowired
    @Lazy
    private IDocInfoService docInfoService;
    @Autowired
    private IDeviceTypeService deviceTypeService;

    @Override
    public List<WorkStep> getByUserPerms(String userId) {
@@ -109,7 +122,7 @@
        if(!b)
            ExceptionCast.cast(CommonCode.FAIL);
        //添加部门权限
        List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(workStep.getProcessId(),"5","1");
        List<PermissionStreamNew> oldDepartPermList = permissionStreamNewService.loadPermissionStreamNewByBusinessId(workStep.getProcessId(), DocAttributionTypeEnum.PROCESS.getCode().toString(),"1");
        if(oldDepartPermList != null && !oldDepartPermList.isEmpty()) {
            List<WorkStepDepartment> workStepDepartmentList = new ArrayList<>();
            List<PermissionStreamNew> permissionStreamList = new ArrayList<>();
@@ -121,7 +134,7 @@
                PermissionStreamNew perm = new PermissionStreamNew();
                perm.setDepartId(item.getDepartId());
                perm.setBusinessId(workStep.getId());
                perm.setBusinessType("6");
                perm.setBusinessType(DocAttributionTypeEnum.WORKSITE.getCode().toString());
                permissionStreamList.add(perm);
            });
            if(!workStepDepartmentList.isEmpty()) {
@@ -136,19 +149,19 @@
            }
        }
        //添加用户权限
        b = productPermissionService.add(workStep.getId(), userId,"6");
        b = productPermissionService.add(workStep.getId(), userId,DocAttributionTypeEnum.WORKSITE.getCode().toString());
        if (!b) {
            ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
        }
        //添加结构树
        ProductMix productMix = new ProductMix(Long.parseLong(workStep.getId()),Long.parseLong(workStep.getProcessId())
                ,workStep.getStepName(),workStep.getStepCode(),6,new Date());
                ,workStep.getStepName(),workStep.getStepCode(),DocAttributionTypeEnum.WORKSITE.getCode(),new Date());
        productMixService.save(productMix);
        //添加权限验证
        PermissionStreamNew permissionStream = new PermissionStreamNew();
        permissionStream.setUserId(userId);
        permissionStream.setBusinessId(workStep.getId());
        permissionStream.setBusinessType("6");
        permissionStream.setBusinessType(DocAttributionTypeEnum.WORKSITE.getCode().toString());
        return permissionStreamNewService.addPermissionStreamNew(permissionStream);
    }

@@ -202,12 +215,12 @@
                en.setStepId(workStep.getId());
                workStepDepartmentList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(workStep.getId(),item.getId(),"6");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(workStep.getId(),item.getId(),DocAttributionTypeEnum.WORKSITE.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setDepartId(item.getId());
                stream.setBusinessId(workStep.getId());
                stream.setBusinessType("6");
                stream.setBusinessType(DocAttributionTypeEnum.WORKSITE.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -264,7 +277,7 @@
            if(en != null) {
                workStepDepartmentList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(workStep.getId(),item.getId(),"6");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndDepartId(workStep.getId(),item.getId(),DocAttributionTypeEnum.WORKSITE.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -296,7 +309,7 @@
        if(en == null)
            ExceptionCast.cast(ProcessInfoCode.PROCESS_NOT_EXIST);
        //验证是否存在文档
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","6").eq("attribution_id",id));
        List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type",DocAttributionTypeEnum.WORKSITE.getCode().toString()).eq("attribution_id",id));
        if (!docRelativeList.isEmpty()){
            ExceptionCast.cast(ProcessInfoCode.WORKSTEP_HAS_DOC);
        }
@@ -322,12 +335,12 @@
                en.setStepId(workStep.getId());
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),item.getId(),"6");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),item.getId(),DocAttributionTypeEnum.WORKSITE.getCode().toString());
            if(stream == null) {
                stream = new PermissionStreamNew();
                stream.setUserId(item.getId());
                stream.setBusinessId(workStep.getId());
                stream.setBusinessType("6");
                stream.setBusinessType(DocAttributionTypeEnum.WORKSITE.getCode().toString());
                permissionStreamList.add(stream);
            }
        });
@@ -358,7 +371,7 @@
            if(en != null) {
                permissionList.add(en);
            }
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),item.getId(),"6");
            PermissionStreamNew stream = permissionStreamNewService.loadPermissionStreamNewByBusinessIdAndUserId(workStep.getId(),item.getId(),DocAttributionTypeEnum.WORKSITE.getCode().toString());
            if(stream != null) {
                permissionStreamList.add(stream);
            }
@@ -379,4 +392,101 @@
        return true;
    }

    /**
     * é€šè¿‡å·¥æ­¥å·ã€å·¥æ­¥åç§°ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * NC文件存在设备类下面
     * @param treeInfoRequest
     * @return
     */
    @Override
    public List<DocInfo> getByWorkStepOtherFile(TreeInfoRequest treeInfoRequest){
        LambdaQueryWrapper<WorkStep> queryWrapper = new LambdaQueryWrapper<>();
        if (treeInfoRequest.getProductIds() != null && !treeInfoRequest.getProductIds().isEmpty()) {
            queryWrapper.in(WorkStep::getProductId, treeInfoRequest.getProductIds());
        }
        if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
            queryWrapper.in(WorkStep::getComponentId, treeInfoRequest.getComponentIds());
        }
        if (treeInfoRequest.getPartsIds() != null && !treeInfoRequest.getPartsIds().isEmpty()) {
            queryWrapper.in(WorkStep::getPartsId, treeInfoRequest.getPartsIds());
        }
        if (treeInfoRequest.getPsvIds() != null && !treeInfoRequest.getPsvIds().isEmpty()) {
            queryWrapper.in(WorkStep::getPsvId, treeInfoRequest.getPsvIds());
        }
        if (treeInfoRequest.getProcessIds() != null && !treeInfoRequest.getProcessIds().isEmpty()) {
            queryWrapper.in(WorkStep::getProcessId, treeInfoRequest.getProcessIds());
        }
        if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.WORKSITE.getCode())){
            queryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),WorkStep::getId,treeInfoRequest.getAttributionId());
        }
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),WorkStep::getStepName, treeInfoRequest.getTreeName());
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),WorkStep::getStepCode, treeInfoRequest.getTreeName());
        queryWrapper.orderByDesc(WorkStep::getCreateTime);
        List<WorkStep> 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(WorkStep::getId).collect(Collectors.joining(","));
            DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
            BeanUtil.copyProperties(treeInfoRequest,docQuery);
            docQuery.setAttributionIds(ids);
            docQuery.setDocClassCode("OTHER");
            docQuery.setAttributionType(DocAttributionTypeEnum.WORKSITE.getCode());
            docInfos=docInfoService.findListByDocQuery(docQuery);
        }
        return docInfos;
    }

    /**
     * é€šè¿‡å·¥æ­¥å·ã€å·¥æ­¥åç§°ç­‰æŸ¥è¯¢å¯¹åº”NC文件
     * NC文件存在设备类下面
     * @param treeInfoRequest
     * @return
     */
    @Override
    public List<DocInfo> getByWorkStepNCFile(TreeInfoRequest treeInfoRequest){
        LambdaQueryWrapper<WorkStep> queryWrapper = new LambdaQueryWrapper<>();
        if (treeInfoRequest.getProductIds() != null && !treeInfoRequest.getProductIds().isEmpty()) {
            queryWrapper.in(WorkStep::getProductId, treeInfoRequest.getProductIds());
        }
        if (treeInfoRequest.getComponentIds() != null && !treeInfoRequest.getComponentIds().isEmpty()) {
            queryWrapper.in(WorkStep::getComponentId, treeInfoRequest.getComponentIds());
        }
        if (treeInfoRequest.getPartsIds() != null && !treeInfoRequest.getPartsIds().isEmpty()) {
            queryWrapper.in(WorkStep::getPartsId, treeInfoRequest.getPartsIds());
        }
        if (treeInfoRequest.getPsvIds() != null && !treeInfoRequest.getPsvIds().isEmpty()) {
            queryWrapper.in(WorkStep::getPsvId, treeInfoRequest.getPsvIds());
        }
        if (treeInfoRequest.getProcessIds() != null && !treeInfoRequest.getProcessIds().isEmpty()) {
            queryWrapper.in(WorkStep::getProcessId, treeInfoRequest.getProcessIds());
        }
        if (Objects.equals(treeInfoRequest.getAttributionType(), DocAttributionTypeEnum.WORKSITE.getCode())){
            queryWrapper.eq(StrUtil.isNotEmpty(treeInfoRequest.getAttributionId()),WorkStep::getProcessId,treeInfoRequest.getAttributionId());
        }
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeName()),WorkStep::getStepName, treeInfoRequest.getTreeName());
        queryWrapper.like(StrUtil.isNotEmpty(treeInfoRequest.getTreeCode()),WorkStep::getStepCode, treeInfoRequest.getTreeName());
        queryWrapper.orderByDesc(WorkStep::getCreateTime);
        List<WorkStep> list = super.list(queryWrapper);
        List<DocInfo> docInfos = new ArrayList<>();
        //NC文件存在对应的设备类下，所以需要过滤
        if (!list.isEmpty()) {
            List<String> workStepIds = list.stream().map(WorkStep::getId).collect(Collectors.toList());
            List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(workStepIds,
                    DocAttributionTypeEnum.WORKSITE.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
            if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
                List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getDeviceManagementId).collect(Collectors.toList());
                DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
                BeanUtil.copyProperties(treeInfoRequest,docQuery);
                docQuery.setAttributionIds(String.join(",",deviceManagementIds));
                docQuery.setDocClassCode("NC");
                docQuery.setAttributionType(DocAttributionTypeEnum.WORKSITE.getCode());
                docInfos=docInfoService.findListByDocQuery(docQuery);
            }
            return docInfos;
        }
        return new ArrayList<>();
    }

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/DispatchFileController.java

@@ -49,7 +49,6 @@
     * @param req
     * @return
     */
    //@AutoLog(value = "nc程序与电子图版签派-分页列表查询")
    @ApiOperation(value="nc程序与电子图版签派-分页列表查询", notes="nc程序与电子图版签派-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<DispatchFile>> queryPageList(DispatchFile dispatchFile,
@@ -63,6 +62,20 @@
    }

     /**
      * æ–‡ä»¶æŸ¥è¯¢å®¡ç­¾æµç¨‹
      * @param attributionId,attributionType,docId
      * @return
      */
     @AutoLog(value = "nc程序与电子图版签派-文件查询审签流程")
     @ApiOperation(value="nc程序与电子图版签派-文件查询审签流程", notes="nc程序与电子图版签派-文件查询审签流程")
     @GetMapping(value = "/queryDispatchDocFile")
     public Result<?> queryDispatchDocFile(@RequestParam(name="attributionId") String attributionId,
                                             @RequestParam(name="attributionType") String attributionType,
                                             @RequestParam(name="docId") String docId){
         return dispatchFileService.queryDispatchDocFile(attributionId,attributionType,docId);
     }

     /**
      * é‡æ–°å¯åŠ¨
      * @param dispatchFileFlowTaskVo
      * @return

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IDispatchFileService.java

@@ -23,6 +23,13 @@
    Result<?> saveDispatchFile(DispatchFile dispatchFile);

    /**
     * æ–‡ä»¶æŸ¥è¯¢å®¡ç­¾æµç¨‹
     * @param attributionId,attributionType,docId
     * @return
     */
    Result<?> queryDispatchDocFile(String attributionId, String attributionType, String docId);

    /**
     * é‡æ–°å¯åŠ¨
     * @param dispatchFileFlowTaskVo
     */

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

@@ -2,6 +2,7 @@

import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.beanutils.BeanUtils;
@@ -30,8 +31,10 @@
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.domain.vo.FlowHistoricalVo;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.flowable.service.IHisWorkTaskService;
import org.jeecg.modules.system.service.ISysUserRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -70,6 +73,8 @@
    private ISysUserRoleService sysUserRoleService;
    @Autowired
    private PermissionService permissionService;
    @Autowired
    private IHisWorkTaskService hisWorkTaskService;
    /**
     * æµç¨‹å¯åŠ¨,保存对应的数据
     * @param dispatchFile
@@ -109,6 +114,29 @@
    }

    /**
     * æ–‡ä»¶æŸ¥è¯¢å®¡ç­¾æµç¨‹
     * @param attributionId,attributionType,docId
     * @return
     */
    @Override
    public Result<?> queryDispatchDocFile(String attributionId, String attributionType, String docId){
        DispatchFile dispatchFile=super.getOne(new LambdaQueryWrapper<DispatchFile>()
                .eq(DispatchFile::getAttributionId, attributionId).eq(DispatchFile::getAttributionType, attributionType)
                .eq(DispatchFile::getDocId, docId));
        if (dispatchFile==null){
            return Result.error("未找到对应审签文件");
        }else {
            FlowMyBusiness flowMyBusiness=flowMyBusinessService.selectByDataId(dispatchFile.getId());
            if (flowMyBusiness==null){
                return Result.error("未找到对应审签流程");
            }else {
                List<FlowHistoricalVo> queryHisTaskByProcInstId=hisWorkTaskService.queryHisTaskByProcInstId(flowMyBusiness.getProcessInstanceId());
                return Result.ok(queryHisTaskByProcInstId);
            }
        }
    }

    /**
     * é‡æ–°å¯åŠ¨
     * @param dispatchFileFlowTaskVo
     */

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1155,6 +1155,7 @@
            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                    .processInstanceId(flowTaskDto.getProcInsId())
                    .singleResult();
            if (historicProcessInstance != null) {
            SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
            if (startUser != null) {
                flowTaskDto.setStartUserId(startUser.getUsername());
@@ -1169,6 +1170,7 @@
                flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
                flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
            }
            }
        });
        IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>();
        flowTaskDtoIPage.setRecords(list);

 lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/IMsiWebapiJsonService.java

@@ -11,7 +11,7 @@

    /**
     * è§£æžå•æ¡æ•°æ®ä¿å­˜åˆ°å•è¡¨
     * @param machineInfo
     * @param data
     * @return
     */
    boolean saveTableAutomationOne(List<MachineEquipentInfo> data);

 lxzn-module-msi/src/main/java/org/jeecg/modules/msi/webapi/service/impl/MsiWebapiJsonServiceImpl.java

@@ -1,7 +1,8 @@
package org.jeecg.modules.msi.webapi.service.impl;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.util.JdbcUtils;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.msi.webapi.entity.MsiWebapiJsonEntity;
@@ -9,8 +10,15 @@
import org.jeecg.modules.msi.webapi.service.IMsiWebapiJsonService;
import org.jeecg.modules.msi.webapi.vo.DetailedListVo;
import org.jeecg.modules.msi.webapi.vo.MachineEquipentInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -19,7 +27,14 @@
@Service
public class MsiWebapiJsonServiceImpl extends ServiceImpl<MsiWebapiJsonMapper, MsiWebapiJsonEntity> implements IMsiWebapiJsonService {

    @Autowired
    private JdbcTemplate jdbcTemplate;

    /**
     * è§£æžå•æ¡æ•°æ®ä¿å­˜åˆ°å•è¡¨
     * @param data
     * @return
     */
    @Override
    public boolean saveTableAutomationOne(List<MachineEquipentInfo> data) {
        if (data ==null || data.isEmpty()) {
@@ -38,10 +53,52 @@
                listParameter.add(parameter);
            }
        }
        //状态数据

        // æ‰§è¡ŒçŠ¶æ€æ•°æ®SQL
        try {
            executeBatchSql(listStatus);
            executeBatchSql(listParameter);
            return true;
        } catch (Exception e) {
            log.error("执行SQL批量插入失败", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        return false;
    }
    }

    /**
     * æ‰¹é‡æ‰§è¡ŒSQL语句
     * @param sqlList SQL语句列表
     * @throws SQLException
     */
    private void executeBatchSql(List<String> sqlList) throws SQLException {
        if (CollectionUtils.isEmpty(sqlList)) {
            return;
        }

        Connection connection = null;
        Statement statement = null;

        try {
            connection = DataSourceUtils.getConnection(jdbcTemplate.getDataSource());
            connection.setAutoCommit(false);
            statement = connection.createStatement();

            for (String sql : sqlList) {
                statement.addBatch(sql);
            }

            statement.executeBatch();
            connection.commit();
        } catch (SQLException e) {
            if (connection != null) {
                connection.rollback();
            }
            throw e;
        } finally {
            JdbcUtils.closeStatement(statement);
            DataSourceUtils.releaseConnection(connection, jdbcTemplate.getDataSource());
        }
    }


    /**