补充机床接口

yangys

2025-06-13 4308b53ee6f9028905a333d86861ab2735ad2166

补充机床接口

 blade-service/blade-mdm/pom.xml

@@ -31,7 +31,11 @@
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-mybatis</artifactId>
        </dependency>

        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-excel</artifactId>
        </dependency>

        <dependency>

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/MdmApplication.java

@@ -1,28 +1,4 @@
/**
 * BladeX Commercial License Agreement
 * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
 * <p>
 * Use of this software is governed by the Commercial License Agreement
 * obtained after purchasing a license from BladeX.
 * <p>
 * 1. This software is for development use only under a valid license
 * from BladeX.
 * <p>
 * 2. Redistribution of this software's source code to any third party
 * without a commercial license is strictly prohibited.
 * <p>
 * 3. Licensees may copyright their own code but cannot use segments
 * from this software for such purposes. Copyright of this software
 * remains with BladeX.
 * <p>
 * Using this software signifies agreement to this License, and the software
 * must not be used for illegal purposes.
 * <p>
 * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
 * not liable for any claims arising from secondary or illegal development.
 * <p>
 * Author: Chill Zhuang (bladejava@qq.com)
 */

package org.springblade.mdm;

import org.springblade.core.cloud.client.BladeCloudApplication;
@@ -30,8 +6,8 @@
//import org.springblade.core.launch.constant.AppConstant;

/**
 * ç³»ç»Ÿæ¨¡å—启动器
 * @author Chill
 * mdm模块启动器
 * @author yangys
 */
@BladeCloudApplication
public class MdmApplication {

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java

@@ -5,6 +5,7 @@
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.entity.MachineSpec;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
@@ -13,6 +14,14 @@
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.FileSystemUtils;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;

@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
@@ -67,4 +76,60 @@
        }
        return page;
    }

    /**
     * æŸ¥è¯¢è¯¦æƒ…
     * @param id æœºåºŠid
     * @return
     */
    public MachineVO detail(long id) {
        Machine machine = this.getById(id);

        MachineVO vo = new MachineVO();
        BeanUtil.copyProperties(machine, vo);

        return vo;
    }

    /**
     * äº§ç”ŸæœºåºŠå›žä¼ ç»“构数据
     * @param id
     */
    public void genMachineFileBackDirs(Long id) throws IOException {
        Machine machine = this.getById(id);
        if(Func.isNotBlank(machine.getProgReceiveDir())){
            if(isLegalDirectoryPath(machine.getProgReceiveDir())) {
                Path path = Paths.get(machine.getProgReceiveDir());
                Files.createDirectories(path);
            }else{
                throw new RuntimeException("非法的目录格式");
            }
        }
    }

    /**
     * åˆ¤æ–­æ˜¯å¦æ˜¯åˆæ³•çš„目录格式
     * @param path
     * @return
     */
    static boolean isLegalDirectoryPath(String path) {
        // åŸºç¡€æ£€æŸ¥
        if (path == null || path.trim().isEmpty()) {
            return false;
        }

        // ä½¿ç”¨NIO检查路径格式
        Path nioPath;
        try {
            nioPath = Paths.get(path);
            if (!nioPath.normalize().toString().equals(path)) {
                return false; // è·¯å¾„不规范
            }
        } catch (InvalidPathException ex) {
            return false;
        }

        return true;

    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java

@@ -1,21 +1,37 @@
package org.springblade.mdm.basesetting.machine.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.system.pojo.entity.User;
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;
import java.util.Map;

@Slf4j
@RestController
@@ -40,11 +56,17 @@
    /**
     * ä¿®æ”¹
     */
    @Operation(summary = "修改", description = "机床组信息")
    @Operation(summary = "修改", description = "机床信息")
    @PostMapping("/update")
    public R<Boolean> update(@RequestBody MachineSaveVO vo) {

        return R.<Boolean>status(service.updateMachine(vo));
    }

    @Operation(summary = "详情", description = "查询机床详情")
    @GetMapping("/detail")
    public R<MachineVO> deatail(long id) {
        return R.data(service.detail(id));
    }

    /**
@@ -68,9 +90,37 @@
    @Operation(summary = "分页查询", description = "名称或编码")
    @GetMapping("/page")
    public R<IPage<MachineVO>> page(MachineQueryVO query) {


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

    @GetMapping("export")
    @ApiOperationSupport(order = 13)
    @Operation(summary = "导出机床", description = "名称或编码")
    public void exportUser(MachineQueryVO query, HttpServletResponse response) {
        query.setCurrent(1);
        query.setSize(Integer.MAX_VALUE);
        IPage<MachineVO> pages = service.pageQuery(query);

        List<MachineExcelVO> list = new ArrayList<>();
        pages.getRecords().forEach(m ->{
            MachineExcelVO excelVO = new MachineExcelVO();
            BeanUtils.copyProperties(m, excelVO);
            list.add(excelVO);
        });

        ExcelUtil.export(response, "机床数据" + DateUtil.time(), "用户数据表", list, MachineExcelVO.class);
    }

    @Operation(summary = "产生机床回传结构树", description = "产生机床回传结构树")
    @PostMapping("/gen-fileback-dirs")
    public R<Void> genFileBackDirs(@RequestParam Long id) {
        try {
            service.genMachineFileBackDirs(id);
        } catch (Exception e) {
            log.error("产生目录异常",e);
            return R.fail(e.getMessage());
        }
        return R.status(true);
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml

@@ -14,7 +14,7 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>
    <select id="pageQuery" resultType="org.springblade.mdm.basesetting.machine.vo.MachineVO">
        select m.id,m.name,m.code,g.dict_value group_name,m.machine_spec,m.manufacturer,m.operator
        select m.id,m.name,m.code,g.dict_key machine_group_code,g.dict_value machine_group_name,m.machine_spec,m.manufacturer,m.operator
        from mdm_machine m join blade_dict_biz g on m.machine_group_code=g.dict_key and g.code='machine_group' and g.is_deleted=0
            ${ew.customSqlSegment}
    </select>

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineExcelVO.java

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

import lombok.Data;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class MachineExcelVO {

    @ColumnWidth(20)
    @ExcelProperty("机床编号")
    private String code;

    @ExcelProperty("机床型号")
    private String name;

    @ExcelProperty("机床组编号")
    private String machineGroupCode;
    /**
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置（key=machine_spec）
     */
    @ExcelProperty("机床规格")
    private String machineSpec;

    @ExcelProperty("操作员")
    private String operator;

    @ExcelProperty("所属单位ID")
    private Long ownerDept;

    @ExcelProperty("生产商")
    private String manufacturer;

    @ExcelProperty("轮询时间")
    private Integer pollingHours;

    @ExcelProperty("控制系统")
    private String controlSystem;

    @ExcelProperty("程序下发目录")
    private String progSendDir;

    @ExcelProperty("程序回传目录")
    private String progReceiveDir;

    @ExcelProperty("备注")
    private String remark;
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java

@@ -8,36 +8,30 @@
@Setter
@Getter
public class MachineSaveVO extends BaseVO {

    @Schema(description = "机床编码")
    private String code;
    @Schema(description = "机床型号")
    private String name;
    /**
     * æ‰€å±žæœºåºŠç»„code,字典machine_group
     */

    @Schema(description = "所属机床组code,字典machine_group")
    private String machineGroupCode;
    /**
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置（key=machine_spec）
     */

    @Schema(description = "机器规格,在业务字典配置（key=machine_spec）")
    private String machineSpec;
    /**
     * æ“ä½œå‘˜ï¼Œæ–‡æœ¬å½•å…¥
     */

    @Schema(description = "操作员(文本录入)")
    private String operator;
    /**
     * æ‰€å±žå•ä½/组织
     */

    @Schema(description = "所属单位")
    private Long ownerDept;
    /**
     * '生产商'
     */

    @Schema(description = "生产商")
    private String manufacturer;
    /**
     * æ£€æŸ¥ç¨‹åºå›žä¼ çš„轮询时间（小时）
     */

    @Schema(description = "轮询时间")
    private Integer pollingHours;
    /**
     * æŽ§åˆ¶ç³»ç»Ÿï¼ˆå¦‚发那科），在业务字典配置(key=machine_controll_system)，使用英文字母
     */

    @Schema(description = "控制系统")
    private String controlSystem;
    /**
     * ç¨‹åºä¸‹å‘目录

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java

@@ -1,5 +1,6 @@
package org.springblade.mdm.basesetting.machine.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;
@@ -11,42 +12,43 @@
    private String code;
    private String name;
    /**
     * æ‰€å±žæœºåºŠç»„ID
     * æ‰€å±žæœºåºŠç»„code
     */
    private Long machineGroupId;
    /**
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置（key=machine_spec）
     */
    private String machineSpec;
    @Schema(description = "机床组代码")
    private String machineGroupCode;

    @Schema(description = "机床组名称")
    private String machineGroupName;

    @Schema(description = "规格")
    private String machineSpec;
    @Schema(description = "规格名称")
    private String machineSpecName;
    /**
     * æ“ä½œå‘˜ï¼Œæ–‡æœ¬å½•å…¥
     */

    @Schema(description = "操作员，文本录入")
    private String operator;
    /**
     * æ‰€å±žå•ä½/组织
     */

    @Schema(description = "所属单位/组织")
    private Long ownerDept;
    /**
     * '生产商'
     */

    @Schema(description = "生产商")
    private String manufacturer;
    /**
     * æ£€æŸ¥ç¨‹åºå›žä¼ çš„轮询时间（小时）
     */
    @Schema(description = "轮询时间")
    private Integer pollingHours;
    /**
     * æŽ§åˆ¶ç³»ç»Ÿï¼ˆå¦‚发那科），在业务字典配置(key=machine_controll_system)，使用英文字母
     */
    @Schema(description = "控制系统，在业务字典配置(key=machine_control_system)")
    private String controlSystem;
    /**
     * ç¨‹åºä¸‹å‘目录
     */

    @Schema(description = "程序下发目录")
    private String progSendDir;
    /**
     * ç¨‹åºå›žä¼ ç›®å½•',
     */

    @Schema(description = "程序回传目录")
    private String progReceiveDir;
    @Schema(description = "备注")
    private String remark;
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java

@@ -11,5 +11,8 @@
    private Long id;

    private Integer status;
    private Long createUser;
    private Date createTime;
    private Long updateUser;
    private Date updateTime;
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
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.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
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.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@Slf4j
@RestController
@RequestMapping("/machineback/file")
@Tag(name = "机床回传文件", description = "机床回传文件")
public class MachineBackFileController {

    @Autowired
    private MachineBackFileService service;


    /**
     * æŽ¥æ”¶
     */
    @Operation(summary = "接收", description = "接收文件")
    @PostMapping("/accept")
    public R<Void> accept(String ids) {
        service.accept(ids);
        return R.success();
    }

    /**
     *拒绝，就是删除
     */
    @Operation(summary = "拒绝", description = "拒绝")
    @PostMapping("/reject")
    public R<Void> reject(@RequestParam String ids) {
        try {
            service.removeBatchByIds(Func.toLongList(ids));
        } catch (Exception e) {
            log.error("删除异常",e);
            return R.fail(e.getMessage());
        }
        return R.status(true);
    }

    /**
     * åˆ†é¡µ
     */
    @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/entity/MachineBackFile.java

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

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;

/**
 * æœºåºŠå›žä¼ æ–‡ä»¶
 */
@Setter
@Getter
@TableName("mdm_machine_back_file")
public class MachineBackFile extends BizEntity {
    public static int STATUS_ACCEPTED = 2;
    public static int STATUS_REJECTED = 2;
    private String filename;
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
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.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;

public interface MachineBackFileMapper extends BladeMapper<MachineBackFile> {

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

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
<?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.springblade.mdm.machineback.mapper.MachineBackFileMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="org.springblade.mdm.machineback.entity.MachineBackFile">
        <id column="id" property="id"/>
        <result column="filename" property="filename"/>
        <result column="status" property="status"/>
        <result column="create_time" property="createTime"/>
        <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,f.filename,f.create_time,m.code machineCode,m.name machineName
        from mdm_machine_back_file f join mdm_machine m on f.machine_code=m.code
            ${ew.customSqlSegment}
    </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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.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.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.stereotype.Service;

import java.util.List;

@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);
    }
    */

    public void accept(String ids) {

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

        for(Long id : idList){
            MachineBackFile backFile = this.getById(id);
            backFile.setStatus(MachineBackFile.STATUS_ACCEPTED);
            this.updateById(backFile);
        }

    }

    public void reject(String ids) {
        List<Long> idList = Func.toLongList(ids);

        for(Long id : idList){
            MachineBackFile backFile = this.getById(id);
            backFile.setStatus(MachineBackFile.STATUS_REJECTED);
            this.updateById(backFile);
        }

    }




    /**
     * æŸ¥è¯¢åˆ†é¡µ
     * @param query æŸ¥è¯¢å‚æ•°
     * @return åˆ†é¡µæ•°æ®
     */
    public IPage<MachineBackFileVO> pageQuery(MachineBackFileQueryVO query) {

        //LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();

        IPage<MachineBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);

        //MachineSpec.valueOf()
        /*
        for (MachineVO record : page.getRecords()) {
            if(record.getMachineSpec() != null){
                MachineSpec spec = MachineSpec.valueOf(record.getMachineSpec());
                record.setMachineSpecName(spec.getText());
            }

        }*/
        return page;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
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;

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

@Schema(description = "机床查询对象")
@Setter
@Getter
public class MachineBackFileQueryVO extends Query {
    @Schema(description = "关键字")
    private String keyword;
    @Schema(description = "规格")
    private String machineSpec;

}

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

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

import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;

@Setter
@Getter
public class MachineBackFileVO extends BaseVO {
    private String filename;
}