机床回传代码更新

yangys

2025-06-19 c5b91210fc14caaffb6df8a76bf12bc29c753467

机床回传代码更新

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

@@ -42,9 +42,9 @@
    @PostMapping("/reject")
    public R<Void> reject(@RequestParam String ids) {
        try {
            service.removeBatchByIds(Func.toLongList(ids));
            service.reject(ids);
        } catch (Exception e) {
            log.error("删除异常",e);
            log.error("拒绝异常",e);
            return R.fail(e.getMessage());
        }
        return R.status(true);
@@ -56,7 +56,6 @@
    @Operation(summary = "分页查询", description = "名称或编码")
    @GetMapping("/page")
    public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {

        IPage<MachineBackFileVO> pages = service.pageQuery(query);
        return R.data(pages);
    }

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,73 @@
package org.springblade.mdm.machineback.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.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
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.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;

@Slf4j
@RestController
@RequestMapping("/machineback/filehandle")
@Tag(name = "机床回传文件处理", description = "机床回传文件处理")
public class MachineBackFileHandleController {

    @Autowired
    private MachineBackFileService service;


    /**
     * åˆ†é¡µ
     */
    @Operation(summary = "分页查询", description = "名称或编码")
    @GetMapping("/page")
    public R<IPage<MachineBackFileVO>> page(MachineBackFileHandleQueryVO query) {
        IPage<MachineBackFileVO> pages = service.handlePageQuery(query);
        return R.data(pages);
    }

    @GetMapping("export-to-inner")
    @ApiOperationSupport(order = 13)
    @Operation(summary = "导出到涉密网", description = "导出到涉密网")
    public void exportToInner(MachineBackFileHandleQueryVO query, HttpServletResponse response) {


    }

    @Operation(summary = "导出Excel", description = "导出Excel")
    @GetMapping("/export-excel")
    public void exportExcel(MachineBackFileHandleQueryVO query, HttpServletResponse response) {
        query.setCurrent(1);
        query.setSize(Integer.MAX_VALUE);
        IPage<MachineBackFileVO> pages = service.handlePageQuery(query);

        List<MachineBackFileHandleExcelVO> list = new ArrayList<>();
        pages.getRecords().forEach(vo ->{
            MachineBackFileHandleExcelVO excelVO    = new MachineBackFileHandleExcelVO();
            excelVO.setCuredStatus(vo.getIsCured()==0?"固化":"未固化");
            BeanUtil.copy(vo, excelVO);
        });
        ExcelUtil.export(response, "机床回传文件处理" + DateUtil.time(), "机床回传文件表", list, MachineBackFileHandleExcelVO.class);

    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package org.springblade.mdm.machineback.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.service.MachineBackProgramStatService;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springblade.mdm.machineback.vo.MachineBackProgramQueryVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@Slf4j
@RestController
@RequestMapping("/machineback/programstat")
@Tag(name = "回传程序统计", description = "回传程序统计")
public class MachineBackProgramStatController {

    @Autowired
    private MachineBackProgramStatService service;


    /**
     * åˆ†é¡µ
     */
    @Operation(summary = "分页查询", description = "")
    @GetMapping("/page")
    public R<IPage<MachineBackFileVO>> page(MachineBackProgramQueryVO query) {
        IPage<MachineBackFileVO> pages = service.pageQuery(query);
        return R.data(pages);
    }
}

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

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

import java.util.Date;

/**
 * æœºåºŠå›žä¼ æ–‡ä»¶
 */
@@ -14,5 +16,10 @@
public class MachineBackFile extends BizEntity {
    public static int STATUS_ACCEPTED = 2;
    public static int STATUS_REJECTED = 2;
    private String filename;

    private String programId;
    /**
     * ç¡®è®¤æ—¶é—´
     */
    private Date confirmTime;
}

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

@@ -6,11 +6,14 @@
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;

public interface MachineBackFileMapper extends BladeMapper<MachineBackFile> {

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

    IPage<MachineBackFileVO> handlePageQuery(IPage<MachineBackFile> page, MachineBackFileHandleQueryVO query);
    //pageMachine
}

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

@@ -12,21 +12,39 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <select id="pageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,f.filename,f.create_time,m.code machineCode,m.name machineName
        select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
        from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
             left join mdm_nc_program p on f.program_id=p.id
       <where>
           f.status=1 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.filename like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
            or p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
                )
        </if>
      </where>
    </select>
    <select id="handlePageQuery" resultType="org.springblade.mdm.machineback.vo.MachineBackFileVO">
        select f.id,p.name program_name,p.is_cured,f.create_time,m.code machine_code, m.name machine_name,f.create_time arrived_time
        from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
        left join mdm_nc_program p on f.program_id=p.id
        <where>
        f.status=2 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 p.name like CONCAT('%', #{query.keyword,jdbcType=VARCHAR},'%')
            )
        </if>
        </where>
    </select>


    <!--    <select id="parentTree" resultMap="treeNodeResultMap">-->
<!--        select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!--    </select>-->

</mapper>

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

@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.DateUtil;
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.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.stereotype.Service;
@@ -17,16 +19,11 @@

@Service
public class MachineBackFileService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {
    /*
    @Transactional
    public void save(MachineSaveVO vo){
        //TODO
        Machine machine = new Machine();
        BeanUtil.copyProperties(vo, machine);
        this.save(machine);
    }
    */

    /**
     * æŽ¥å—
     * @param ids
     */
    public void accept(String ids) {

        List<Long> idList = Func.toLongList(ids);
@@ -34,11 +31,16 @@
        for(Long id : idList){
            MachineBackFile backFile = this.getById(id);
            backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
            backFile.setConfirmTime(DateUtil.now());
            this.updateById(backFile);
        }

    }

    /**
     * æ‹’绝
     * @param ids
     */
    public void reject(String ids) {
        List<Long> idList = Func.toLongList(ids);

@@ -60,4 +62,9 @@

        return page;
    }

    public IPage<MachineBackFileVO> handlePageQuery(MachineBackFileHandleQueryVO query) {
        IPage<MachineBackFileVO> page = this.getBaseMapper().handlePageQuery(Condition.getPage(query),query);
        return page;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package org.springblade.mdm.machineback.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.machineback.entity.MachineBackFile;
import org.springblade.mdm.machineback.mapper.MachineBackFileMapper;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springblade.mdm.machineback.vo.MachineBackProgramQueryVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å›žä¼ æ—¶é—´ç»Ÿè®¡æœåŠ¡
 */
@Service
public class MachineBackProgramStatService extends BizServiceImpl<MachineBackFileMapper, MachineBackFile> {


    /**
     * æŸ¥è¯¢åˆ†é¡µ
     * @param query æŸ¥è¯¢å‚æ•°
     * @return åˆ†é¡µæ•°æ®
     */
    public IPage<MachineBackFileVO> pageQuery(MachineBackProgramQueryVO query) {
        //IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
        //return page;
        return null;
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package org.springblade.mdm.machineback.vo;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import lombok.Data;

import java.util.Date;

/**
 * æœºåºŠå›žä¼ æ–‡ä»¶å¤„理导出excelVO
 */
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class MachineBackFileHandleExcelVO {

    @ExcelProperty("程序编号")
    private String programName;

    @ColumnWidth(20)
    @ExcelProperty("回传机床")
    private String machineCode;
    @ExcelProperty("固化状态")
    private String curedStatus;

    @DateTimeFormat("yyyy-MM-dd HHmmss")
    @ExcelProperty("文件到达时间")
    private Date arrivedTime;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.springblade.mdm.machineback.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.support.Query;

import java.time.LocalDateTime;

/**
 * åˆ†é¡µæ‹†çº¿å‘¢
 */

@Schema(description = "机床回传文件处理查询对象")
@Setter
@Getter
public class MachineBackFileHandleQueryVO extends Query {
    @Schema(description = "确认时间-开始")
    private LocalDateTime confirmTimeBegin;
    @Schema(description = "确认时间-截止")
    private LocalDateTime confirmTimeEnd;

}

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

@@ -9,7 +9,7 @@
 * åˆ†é¡µæ‹†çº¿å‘¢
 */

@Schema(description = "机床查询对象")
@Schema(description = "机床回传文件查询对象")
@Setter
@Getter
public class MachineBackFileQueryVO extends Query {

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

@@ -1,11 +1,24 @@
package org.springblade.mdm.machineback.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;

import java.util.Date;

@Schema(description = "机床回传文件")
@Setter
@Getter
public class MachineBackFileVO extends BaseVO {
    private String filename;
    @Schema(description = "文件名称")
    private String name;
    @Schema(description = "机床编号/回传机床")
    private String machineCode;
    @Schema(description = "程序名称/编号")
    private String programName;
    @Schema(description = "固化状态")
    private Integer isCured;
    @Schema(description = "文件到达时间")
    private Date arrivedTime;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
package org.springblade.mdm.machineback.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.support.Query;

import java.time.LocalDateTime;

/**
 * åˆ†é¡µæ‹†çº¿å‘¢
 */

@Schema(description = "回传程序统计查询对象")
@Setter
@Getter
public class MachineBackProgramQueryVO extends Query {
    @Schema(description = "回传时间-开始")
    private LocalDateTime backTimeBegin;
    @Schema(description = "回传时间-截止")
    private LocalDateTime backTimeEnd;
    @Schema(description = "关键字")
    private String keyword;

    @Schema(description = "所属部门ID")
    private Long deptId;
}

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

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

package org.springblade.mdm.program.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.NcProgramService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

/**
 * ç¨‹åºæ¶‰å¯†ç½‘-工控网交换接口
 *
 * @author yangys
 */
@NonDS
@RestController
@RequestMapping("/program/exchange")
@AllArgsConstructor
@Tag(name = "数控程序导入导出", description = "数控程序导入导出")
@Slf4j
public class NcProgramExchangeController {

    private final NcProgramService ncProgramService;

    @PostMapping("/export-dnc")
    @Operation(summary = "数控程序导出dnc", description = "数控程序导出到工控网")
    public void exportDnc(Long nodeId, HttpServletResponse response) {

        //return R.<Boolean>status(true);
    }

    @PostMapping("/import-dnc-file")
    @Operation(summary = "上传工控网回传文件", description = "上传程序/附件文件")
    public R<Boolean> importDncFile(@RequestParam MultipartFile file,Long nodeId,
                             @RequestParam String category) {
        ncProgramService.uploadNcFile(file,nodeId,category);
        return R.<Boolean>status(true);

    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package org.springblade.mdm.program.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.support.Query;

/**
 * åˆ†é¡µæ‹†çº¿å‘¢
 */

@Schema(description = "机床回传文件查询对象")
@Setter
@Getter
public class MachineBackFileQueryVO extends Query {
    @Schema(description = "程序名称")
    private String programName;


}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.springblade.mdm.program.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;

@Setter
@Getter
@Schema(description = "机床回传文件")
public class MachineBackFileVO extends BaseVO {


    @Schema(description = "程序名称")
    private String programName;
    @Schema(description = "机床编码/设备编码")
    private String programNo;
}