代码格式整理；机床回传文件

yangys

2025-08-13 f26051cf29997af1a0c0862f583ea477163ab77e

代码格式整理；机床回传文件

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/entity/MachineFile.java

@@ -17,6 +17,22 @@
@TableName("mdm_machine_file")
public class MachineFile extends BizEntity {
    /**
     * 正常状态，刚接收
     */
    public static final int STATUS_NORMAL = 0;
    /**
     * 用户接收了
     */
    public static final int STATUS_ACCEPTED = 1;
    /**
     * 用户拒绝接收
     */
    public static final int STATUS_REJECTED = 2;
    /**
     * 文件被清除(被定时任务标记)
     */
    public static final int STATUS_REMOVED = 3;
    /**
     * 节点类型： REC目录
     */
    public static final String DIR_TYPE_REC = "REC";
@@ -75,4 +91,11 @@
        //disp = StringUtils.replace(disp,"bytes","字节");
        return disp;
    }

    /**
     * 标记文件已经删除
     */
    public void markFileDeleted() {
        this.setStatus(STATUS_REMOVED);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/mapper/MachineFileMapper.java

@@ -1,12 +1,22 @@
package org.springblade.mdm.gkw.programnode.mapper;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.entity.ProgramNode;
import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;

import java.util.List;

public interface MachineFileMapper extends BladeMapper<MachineFile> {

    /**
     * 机床回传文件查询
     * @param query
     * @return
     */
    IPage<MachineBackFileVO> machineBackFilePageQuery(IPage<MachineBackFileVO> page, @Param("query")MachineBackFileQueryVO queryVO);
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/mapper/MachineFileMapper.xml

@@ -10,6 +10,23 @@
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <select id="machineBackFilePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,f.name,f.machine_code,f.file_create_time arrived_time,f.md5,f.file_size
        from mdm_machine_file f join mdm_machine m on f.machine_code=m.code and m.is_deleted=0
        <where>
            f.dir_type='REC' and f.is_deleted=0

            <if test="query.machineSpec!=null and query.machineSpec!=''">
                and m.machine_spec=#{query.machineSpec,jdbcType=VARCHAR}
            </if>
            <if test="query.keyword!=null and query.keyword!=''">
                and (
                    m.code like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%') or m.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                or f.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                )
            </if>
        </where>
    </select>


</mapper>

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

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

package org.springblade.mdm.gkw.programnode.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
@@ -8,12 +9,15 @@
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.tool.utils.Charsets;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.mapper.MachineFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -116,4 +120,9 @@
        FileUtils.writeStringToFile(filePath.toFile(),content,charsetName);

    }

    @Transactional(readOnly = true)
    public IPage<MachineBackFileVO> machineBackFilePageQuery(MachineBackFileQueryVO query) {
        return this.baseMapper.machineBackFilePageQuery(Condition.getPage(query),query);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java

@@ -13,6 +13,7 @@
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
@@ -32,7 +33,8 @@

    @Autowired
    private MachineBackFileService service;

    @Autowired
    private MachineFileService machineFileService;

    /**
     * 接收
@@ -65,7 +67,7 @@
    @Operation(summary = "分页查询", description = "名称或编码")
    @GetMapping("/page")
    public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
        IPage<MachineBackFileVO> pages = service.pageQuery(query);
        IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
        return R.data(pages);
    }

@@ -78,7 +80,8 @@
        query.setCurrent(1);
        query.setSize(Integer.MAX_VALUE);

        IPage<MachineBackFileVO> pages = service.pageQuery(query);
        //IPage<MachineBackFileVO> pages = service.pageQuery(query);
        IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
        List<MachineBackFileExcelVO> list = new ArrayList<>();
        pages.getRecords().forEach(m ->{
            MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.java

@@ -12,7 +12,7 @@

public interface MachineBackFileMapper extends BladeMapper<MachineBackFile> {

    IPage<MachineBackFileVO> pageQuery(IPage<MachineBackFile> page, @Param("query")MachineBackFileQueryVO queryVO);
    //IPage<MachineBackFileVO> pageQuery(IPage<MachineBackFile> page, @Param("query")MachineBackFileQueryVO queryVO);

    /**
     * 机床回传文件分页查询

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/mapper/MachineBackFileMapper.xml

@@ -11,6 +11,7 @@
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <!--
    <select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,concat('xxx',f.id) name,1 as is_cured,f.create_time,'a' machine_code, f.create_time arrived_time
        from mdm_machine_back_file f
@@ -27,7 +28,7 @@
        </if>
      </where>
    </select>

-->
    <!--机床回传程序处理分页-->
    <select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,p.name name,p.code,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/service/MachineBackFileService.java

@@ -11,6 +11,8 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
@@ -23,7 +25,7 @@
@AllArgsConstructor
@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
    private final NcProgramService progService;
    private final MachineFileService macineFileService;
    private final OssTemplate ossTemplate;
    /**
     * 接受
@@ -32,8 +34,12 @@
    public void accept(String ids) {

        List<Long> idList = Func.toLongList(ids);

        MachineFile mf;
        for(Long id : idList){
            mf = macineFileService.getById(id);
            mf.setStatus(MachineFile.STATUS_ACCEPTED);
            macineFileService.updateById(mf);

            MachineBackFile backFile = this.getById(id);
            backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
            backFile.setConfirmTime(DateUtil.now());
@@ -64,10 +70,11 @@
     * @param query 查询参数
     * @return 分页数据
     */
    /*
    public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {
        IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
        return page;
    }
    }*/

    /**
     * 机床回传程序处理分页查询

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

@@ -107,7 +107,7 @@
            begin = arr[0];
            end = arr[1];
        }else if(arr.length == 1){
            begin = begin = arr[0];
            begin = arr[0];
            end = "";
        }


 blade-service/blade-mdm/src/main/java/org/springblade/mdm/task/MachineFileScanTask.java

@@ -177,11 +177,12 @@
            .filter(Files::isRegularFile).toList();

        for(MachineFile mf : machineFiles){

            long findCount = files.stream().filter(filePath -> {return filePath.toFile().getName().equals(mf.getName());}).count();
            long findCount = files.stream().filter(filePath -> filePath.toFile().getName().equals(mf.getName())).count();
            if(findCount == 0){
                //文件夹内没找到，需要删除记录
                this.machineFileService.save(mf);
                //this.machineFileService.save(mf);
                mf.markFileDeleted();
                this.machineFileService.updateById(mf);
            }
        }
    }