新增工控网回传历史接口

yangys

2025-08-17 685d26c3a34dbb532a2612ce4cd5f9d904c8d6d1

新增工控网回传历史接口

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

@@ -91,11 +91,6 @@
                ncNodeService.save(newCuredNode);

                //新的流程对应的文件更新到新节点下
                /*
                List<FlowProgramFile> newFlowFileList = flowProgramFileService.lambdaQuery()
                    .eq(FlowProgramFile::getProcessInstanceId, progProperties.getProcessInstanceId()).list();

                 */
                List<FlowProgramFile> newFlowFileList = flowProgramFileService.listByProcessInstanceId(progProperties.getProcessInstanceId());
                for (FlowProgramFile newFlowFile : newFlowFileList) {
                    NcNode newProgramNode = new NcNode();

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java

@@ -1,6 +1,7 @@

package org.springblade.mdm.program.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -10,7 +11,8 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.DNCSendBackService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.service.DncBackFileService;
import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -30,6 +32,7 @@
public class DncSendBackController {

    private final DNCSendBackService dncSendBackService;
    private final DncBackFileService dncBackFileService;
    /**
     * ä¸Šä¼ DNC回传文件
     *
@@ -68,4 +71,11 @@
        }
        return R.success();
    }

    @Operation(summary = "工控网回传记录分页查询", description = "工控网回传记录分页查询,查询回传历史")
    @GetMapping("/dnc-back-page")
    public R<IPage<DncBackFileVO>> page(DncBackFileQueryVO query) {

        return R.data(dncBackFileService.pageQuery(query));
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/DncBackFile.java

@@ -20,7 +20,7 @@
    /**
     * ç¨‹åºåŒ…名 èŠ‚点 çš„id
     */
    private Long ncNodeId;
    private Long approvedId;
    /**
     * ç¡®è®¤æ—¶é—´
     */

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.java

@@ -15,6 +15,6 @@
     * @param queryVO
     * @return
     */
    IPage<DncBackFileVO> pageQuery(IPage<DncBackFile> page, @Param("query") DncBackFileQueryVO queryVO);
    IPage<DncBackFileVO> pageQuery(@Param("page")IPage<DncBackFile> page, @Param("query") DncBackFileQueryVO queryVO);

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml

@@ -13,13 +13,15 @@

    <!--DNC回传程序处理分页-->
    <select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
        select f.id,p.name name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
        select f.id,n.name name,f.create_time,m.code machine_code, m.name machine_name,f.create_time
        from mdm_dnc_back_file f
             left join mdm_nc_program p on f.nc_program_id=p.id
             left join mdm_machine m on p.machine_code=m.code
       <where>
           f.status=1 and f.is_deleted=0

        left join mdm_nc_program_approved a on f.approved_id=a.id
        join mdm_nc_node n on a.nc_node_id=n.id
        left join mdm_machine m on n.machine_code=m.code

       <where>
           f.is_deleted=0
        <if test="query.machineSpec!=null and query.machineSpec!=''">
            and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
        </if>
@@ -28,6 +30,12 @@
            or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                )
        </if>
       <if test="query.createTimeBegin!=null">
           and a.create_time &gt;= #{query.createTimeBegin}
       </if>
       <if test="query.createTimeEnd!=null">
           and a.create_time &lt;= #{query.createTimeEnd}
       </if>
      </where>
    </select>


 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java

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

package org.springblade.mdm.program.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
import org.springblade.mdm.program.entity.DncBackFile;
import org.springblade.mdm.program.mapper.DncBackFileMapper;
import org.springblade.mdm.program.vo.DncBackFileQueryVO;
import org.springblade.mdm.program.vo.DncBackFileVO;
import org.springframework.stereotype.Service;

/**
 * DNC回传文件处理服务
 *
 * @author yangys
 */
@Slf4j
@Service
@AllArgsConstructor
public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
    private final NcNodeService ncNodeService;
    private final OssTemplate ossTemplate;


    public IPage<DncBackFileVO> pageQuery(DncBackFileQueryVO query) {
        return this.baseMapper.pageQuery(Condition.getPage(query),query);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileQueryVO.java

@@ -5,6 +5,8 @@
import lombok.Setter;
import org.springblade.core.mp.support.Query;

import java.util.Date;

/**
 * åˆ†é¡µæŸ¥è¯¢å‚æ•°
 */
@@ -18,4 +20,9 @@
    @Schema(description = "规格")
    private String machineSpec;

    @Schema(description = "回传时间开始")
    private Date createTimeBegin;
    @Schema(description = "回传时间截止")
    private Date createTimeEnd;

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/DncBackFileVO.java

@@ -7,18 +7,19 @@

import java.util.Date;

/**
 * ä»Žå·¥æŽ§ç½‘回传涉密网的导入文件历史
 */
@Schema(description = "DNC回传文件")
@Setter
@Getter
public class DncBackFileVO extends BaseVO {
    @Schema(description = "文件名称")
    private String name;
    @Schema(description = "机床编号/回传机床")
    @Schema(description = "机床编号")
    private String machineCode;
    @Schema(description = "程序编号")
    private String code;
    @Schema(description = "固化状态")
    private Integer isCured=0;
    @Schema(description = "文件到达时间")
    private Date arrivedTime;
}