增加固化流程文件内容比对接口

yangys

2025-08-20 fe185a5eb4669e925af908153bdf21778551fdb4

增加固化流程文件内容比对接口

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowFileController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,62 @@

package org.springblade.mdm.flow.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.tika.utils.StringUtils;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.CompareDataVO;
import org.springblade.mdm.program.vo.NcNodeQueryVO;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * ç¨‹åºèŠ‚点
 *
 * @author yangys
 */
@NonDS
@RestController
@RequestMapping("/flow/file")
@AllArgsConstructor
@Tag(name = "流程文件", description = "流程文件")
@Slf4j
public class FlowFileController {
    private final NcNodeService ncNodeService;
    private final ProgramFlowStatusQueryService programFlowStatusQueryService;
    private final FlowProgramFileService flowProgramFileService;

    @GetMapping("/compare-with-try")
    @Operation(summary = "对比当前文件与之前试切版本的内容", description = "查询对比内容的2个文本数据")
    public R<CompareDataVO> compareWithTry(@Parameter(description="文件id)")Long fileId) {
        CompareDataVO vo = new CompareDataVO();
        FlowProgramFile flowFile = flowProgramFileService.getById(fileId);
        try {
            vo.setContent1(flowProgramFileService.getFileContent(fileId));

            NcNode pkgNode = ncNodeService.getByProcessInstanceId(flowFile.getProcessInstanceId());
            NcNode programNode = ncNodeService.getLastEditionProgramFile(flowFile.getName(), pkgNode.getId());
            if (programNode != null && programNode.getFlowProgramFileId() != null) {
                vo.setContent2(flowProgramFileService.getFileContent(programNode.getFlowProgramFileId()));
            }else{
                vo.setContent2(StringUtils.EMPTY);
            }
        }catch(Exception e) {
            log.error("获取比对内容错误",e);
        }
        return R.data(vo);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java

@@ -59,7 +59,7 @@
    private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
        Map<String, Object> vars = new HashMap<>();
        NcNode programPackage = this.ncNodeService.getById(nodeId);

        vars.put(FlowContants.NODE_ID,programPackage.getId());
        vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
        //机床型号
        //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java

@@ -8,17 +8,8 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.gkw.programnode.service.ProgramNodeService;
import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
import org.springblade.mdm.program.vo.CompareDataVO;
import org.springblade.mdm.program.vo.NcNodeQueryVO;
import org.springblade.mdm.program.vo.NcNodeVO;
import org.springframework.web.bind.annotation.*;

import java.util.List;