全部提交

yangys

2025-08-22 538857185263f29b325de9a34ae066c21b7cd371

全部提交

 blade-service/blade-mdm/pom.xml

@@ -79,11 +79,13 @@
            <artifactId>tika-core</artifactId>
            <version>3.2.0</version>
        </dependency>
        <!--
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-devtools</artifactId>
            <optional>true</optional>
        </dependency>
        -->
        <dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-core-test</artifactId>

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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -10,11 +12,19 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
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.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
import org.springblade.mdm.basesetting.producedivision.vo.DivisionExcel;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
import org.springblade.mdm.basesetting.producedivision.vo.QinzheFgbExcel;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,11 +35,15 @@
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;

@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
    @Autowired
    private ISysClient sysClient;
    @Autowired
    private MdmDeptService mdmDeptService;
    @Transactional
    public void saveMachine(MachineSaveVO vo){
        checkMachine(vo);
@@ -92,7 +106,6 @@
        machine.setOperator(vo.getOperator());
        machine.setControlSystem(vo.getControlSystem());
        machine.setOwnerDept(vo.getOwnerDept());
        machine.setPollingHours(vo.getPollingHours());
        machine.setProgSendDir(vo.getProgSendDir());
        machine.setProgReceiveDir(vo.getProgReceiveDir());
        machine.setProgTempDir(vo.getProgTempDir());
@@ -120,9 +133,7 @@
                query.setDeptAncestors(rs.getData().getAncestors()+","+rs.getData().getId());
            }
        }
        IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query), query);

        return page;
        return this.getBaseMapper().pageQuery(Condition.getPage(query), query);
    }

    /**
@@ -190,8 +201,5 @@
        return this.lambdaQuery().eq(Machine::getCode, machineCode).one();
    }

    @Transactional
    public String importMachines(MultipartFile file) {
        return "";//导入成功，给空串，部分不成功给提示
    }

}

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

@@ -1,31 +1,21 @@
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.service.MachineImportService;
import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
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.mdm.program.vo.MdmProgramImportVO;
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.*;
@@ -33,7 +23,6 @@

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

@Slf4j
@RestController
@@ -43,7 +32,8 @@

    @Autowired
    private MachineService service;

    @Autowired
    private MachineImportService machineImportService;
    /**
     * æ–°å¢ž
     */
@@ -79,7 +69,7 @@
    @Operation(summary = "机床导入", description = "机床导入，全部成功返回空串，部分成功返回具体信息")
    public R<String> importMachines(@RequestParam MultipartFile file) {
        try {
            return R.data(service.importMachines(file));
            return R.data(machineImportService.importMachines(file));
        }catch (Exception e){
            log.error("导入错误",e);
            return R.fail(e.getMessage());
@@ -118,14 +108,14 @@
        query.setSize(Integer.MAX_VALUE);
        IPage<MachineVO> pages = service.pageQuery(query);

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

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

    @Operation(summary = "产生机床回传结构树", description = "产生机床回传结构树")

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

@@ -1,9 +1,6 @@
package org.springblade.mdm.basesetting.machine.mapper;

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.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -12,6 +9,11 @@

public interface MachineMapper extends BladeMapper<Machine> {

    /**
     * æœºåºŠåˆ†é¡µæŸ¥è¯¢
     * @param page åˆ†é¡µä¿¡æ¯
     * @param query æŸ¥è¯¢å‚æ•°
     * @return åˆ†é¡µæ•°æ®
     */
    IPage<MachineVO> pageQuery(IPage<Machine> page, @Param("query") MachineQueryVO query);
    //pageMachine
}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import io.jsonwebtoken.lang.Collections;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.excel.util.ExcelUtil;
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.api.R;
import org.springblade.core.tool.utils.BeanUtil;
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.basesetting.machine.mapper.MachineMapper;
import org.springblade.mdm.basesetting.machine.vo.MachineExcel;
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.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
import org.springblade.system.feign.IDictBizClient;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;

@Service
public class MachineImportService extends BizServiceImpl<MachineMapper, Machine> {
    @Autowired
    private ISysClient sysClient;
    @Autowired
    private IDictBizClient dictBizClient;
    @Autowired
    private MdmDeptService mdmDeptService;
    @Autowired
    private MachineService machineService;
    @Transactional
    public String importMachines(MultipartFile file) {
        List<MachineExcel> list = ExcelUtil.read(file, MachineExcel.class);
        return "";//导入成功，给空串，部分不成功给提示
    }

    @Transactional
    ImportResult transAndSave(List<MachineExcel> list){
        //machine_spec
            //machine_control_system
        //machine_control_system
        R<List<DictBiz>> machineSpecListRes = dictBizClient.getList("machine_spec");
        List<DictBiz> machineSpecList = machineSpecListRes.isSuccess() ? machineSpecListRes.getData() : Collections.emptyList();

        R<List<DictBiz>> machineSystemRes = dictBizClient.getList("machine_control_system");
        List<DictBiz> machineSystemList = machineSystemRes.isSuccess() ? machineSystemRes.getData() : Collections.emptyList();

        R<List<DictBiz>> machineGroupRes = dictBizClient.getList("machine_group");
        List<DictBiz>  machineGroupList = machineGroupRes.isSuccess() ? machineGroupRes.getData() : Collections.emptyList();
        DictBiz emptyDit = new DictBiz();

        List<Machine> entityList = new ArrayList<>();
        MdmDept ownerDept;
        ImportResult ir = new ImportResult();
        int failCount = 0;
        int successCount = 0;
        StringBuilder msg = new StringBuilder();
        for(MachineExcel excelVO : list){
            Machine machine = new Machine();

            BeanUtils.copyProperties(excelVO, machine);
            ownerDept = mdmDeptService.getByName(excelVO.getOwnerDeptName());
            if(ownerDept != null){
                machine.setOwnerDept(ownerDept.getId());
            }
            //类型
            Optional<DictBiz> specOpt = machineSpecList.stream().filter(s -> StringUtils.equals(s.getDictValue(),excelVO.getMachineSpecName())).findFirst();
            machine.setMachineSpec(specOpt.orElse(emptyDit).getDictKey());
            //系统
            Optional<DictBiz> sysOpt = machineSystemList.stream().filter(s -> StringUtils.equals(s.getDictValue(),excelVO.getControlSystemName())).findFirst();
            machine.setControlSystem(sysOpt.orElse(emptyDit).getDictKey());

            //机床组
            Optional<DictBiz> groupOpt = machineGroupList.stream().filter(s -> StringUtils.equals(s.getDictValue(),excelVO.getMachineGroupName())).findFirst();
            machine.setControlSystem(groupOpt.orElse(emptyDit).getDictKey());

            //entityList.add(machine);
            Machine oriMachine = machineService.getByCode(machine.getCode());

            if(oriMachine != null){
                msg.append(machine.getCode()).append("机床编码重复:").append(machine.getCode());
                failCount ++;
            }

            machineService.save(machine);
            successCount ++;
        }

        ir.setFailure(failCount);
        ir.setSuccess(successCount);

        if(ir.getFailure()==0){
            ir.setMessage("导入成功");
        }else{
            ir.setMessage(msg.toString());
        }
        return ir;
    }
}

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

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

import com.alibaba.excel.annotation.ExcelIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
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 MachineExcel {

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

    @ExcelProperty("机床型号")
    private String name;
    @ExcelIgnore
    @ExcelProperty("机床组")
    private String machineGroupCode;
    @ExcelProperty("机床组")
    private String machineGroupName;
    /**
     * æœºå™¨ç±»åž‹(规格):01车床/02铣床,在业务字典配置（key=machine_spec）
     */
    @ExcelProperty("机床类型")
    private String machineSpecName;


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

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

    @ExcelProperty("所属单位")
    private String ownerDeptName;

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

    @ExcelIgnore
    @ExcelProperty("控制系统字典key")
    private String controlSystem;
    @ExcelProperty("控制系统")
    private String controlSystemName;

    @Schema(description = "程序临时目录")
    private String progTempDir;

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

    @Schema(description = "SND文件夹保持时间(小时)")
    private Integer sendDirExpiryHours;

    @ExcelProperty("程序回传目录")
    private String progReceiveDir;
    @Schema(description = "RECEIVE文件夹保持时间(小时)")
    private Integer receiveDirExpiryHours;

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

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

ÎļþÒÑɾ³ý

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

@@ -22,34 +22,35 @@
    @Schema(description = "操作员(文本录入)")
    private String operator;

    @Schema(description = "所属单位")
    @Schema(description = "所属组织")
    private Long ownerDept;

    @Schema(description = "生产商")
    private String manufacturer;

    @Schema(description = "轮询时间")
    private Integer pollingHours;

    @Schema(description = "控制系统")
    private String controlSystem;

    @Schema(description = "状态")
    private String statusName;

    @Schema(description = "程序临时目录")
    private String progTempDir;
    /**
     * ç¨‹åºä¸‹å‘目录
     */
    @Schema(description = "程序回传目录")
    private String progSendDir;
    /**
     * ',
     */

    @Schema(description = "程序回传目录")
    private String progReceiveDir;
    @Schema(description = "程序临时目录")
    private String progTempDir;

    @Schema(description = "备注")
    private String remark;

    @Schema(description = "send文件夹保持时间 å°æ—¶")
    private Integer sendDirExpiryHours;


    @Schema(description = "receive文件夹保持时间 å°æ—¶")
    private Integer receiveDirExpiryHours;

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/MdmDept.java

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

package org.springblade.mdm.basesetting.producedivision.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.io.Serial;
import java.io.Serializable;

/**
 * å®žä½“ç±»
 *
 * @author Chill
 */
@Data
@TableName("blade_dept")
@Schema(description = "Dept对象")
public class MdmDept implements Serializable {

    @Serial
    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @Schema(description = "主键")
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * ç§Ÿæˆ·ID
     */
    @Schema(description = "租户ID")
    private String tenantId;

    /**
     * çˆ¶ä¸»é”®
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @Schema(description = "父主键")
    private Long parentId;

    /**
     * æœºæž„名
     */
    @Schema(description = "机构名")
    private String deptName;

    /**
     * æœºæž„全称
     */
    @Schema(description = "机构全称")
    private String fullName;

    /**
     * ç¥–级机构主键
     */
    @Schema(description = "祖级机构主键")
    private String ancestors;

    /**
     * æœºæž„类型
     */
    @Schema(description = "机构类型")
    private Integer deptCategory;

    /**
     * æŽ’序
     */
    @Schema(description = "排序")
    private Integer sort;

    /**
     * å¤‡æ³¨
     */
    @Schema(description = "备注")
    private String remark;

    /**
     * ä¸šåŠ¡çŠ¶æ€
     */
    @Schema(description = "业务状态")
    private Integer status;

    /**
     * æ˜¯å¦å·²åˆ é™¤
     */
    @TableLogic
    @Schema(description = "是否已删除")
    private Integer isDeleted;


}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/MdmDeptMapper.java

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

package org.springblade.mdm.basesetting.producedivision.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;

/**
 * DeptMapper æŽ¥å£
 *
 * @author yangsy
 */
public interface MdmDeptMapper extends BaseMapper<MdmDept> {



}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/MdmDeptMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
<?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.basesetting.producedivision.mapper.MdmDeptMapper">

    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="deptResultMap" type="org.springblade.mdm.basesetting.producedivision.entity.MdmDept">
        <id column="id" property="id"/>
        <result column="parent_id" property="parentId"/>
        <result column="dept_name" property="deptName"/>
        <result column="full_name" property="fullName"/>
        <result column="ancestors" property="ancestors"/>
        <result column="dept_category" property="deptCategory"/>
        <result column="sort" property="sort"/>
        <result column="remark" property="remark"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


</mapper>

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/MdmDeptService.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.mapper.MdmDeptMapper;
import org.springblade.mdm.commons.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class MdmDeptService extends ServiceImpl<MdmDeptMapper, MdmDept> {
    @Autowired
    private ParamService paramService;

    /**
     * æ ¹æ®åç§°èŽ·å–部门
     * @param deptName éƒ¨é—¨åç§°
     * @return åŒ¹é…çš„部门
     */
    public MdmDept getByName(String deptName) {
        MdmDept dept = null;
        List<MdmDept> depts = this.lambdaQuery().eq(MdmDept::getDeptName, deptName)
            .eq(MdmDept::getStatus, 1).list();
        Long userId = null;
        if (!depts.isEmpty()) {
            dept = depts.get(0);
        }

        return dept;
    }

}

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

@@ -13,15 +13,11 @@
import org.flowable.engine.task.Comment;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
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.commons.vo.IdsVO;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.ApproveTableService;
import org.springblade.mdm.flow.service.FlowBusinessService;
@@ -35,13 +31,11 @@
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@Slf4j

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

@@ -8,11 +8,6 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
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.MachineVO;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;

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

@@ -16,19 +16,12 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.UrlUtil;
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.commons.vo.IdsVO;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.service.NcProgramExportInnerService;
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.io.IOException;

 doc/mdm/qinzhetemplate.xlsx

Binary files differ

 doc/sql/mdm/mdm.mysql.all.create.sql

@@ -30,7 +30,9 @@
  `polling_hours` int(11) COMMENT '检查程序回传的轮询时间（小时）',
  `control_system` varchar(20) DEFAULT NULL COMMENT '控制系统（如发那科），在业务字典配置(key=machine_controll_system)，使用英文字母',
  `prog_send_dir` varchar(400)  COMMENT '程序下发目录',
  `send_dir_expiry_hours` int NOT NULL DEFAULT 8 COMMENT 'send文件夹文件有效期（小时)',
  `prog_receive_dir` varchar(400)  COMMENT '程序回传目录',
  `receive_dir_expiry_hours` varchar(255) NOT NULL DEFAULT 8 COMMENT 'receive文件夹文件有效期（小时）',
  `prog_temp_dir` varchar(400)  COMMENT '程序长期存储目录',
  `remark` varchar(200)  COMMENT '备注',
  `status` int DEFAULT NULL COMMENT '业务状态，1：启用；0禁用',