yangys
2025-06-04 78cc285f739d97d117dd2199649715529c40a199
修改nacos配置
已重命名3个文件
已修改2个文件
已删除2个文件
已添加9个文件
已复制2个文件
420 ■■■■ 文件已修改
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/MachineGroupService.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/controller/MachineGroupController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/entity/MachineGroup.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
doc/sql/mdm/mdm.all.create.sql 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -42,22 +42,22 @@
    /**
     * nacos å¯†ç 
     */
    String NACOS_PASSWORD = "nacos";
    String NACOS_PASSWORD = "QW_nacos_!@#$";
    /**
     * nacos dev åœ°å€
     */
    String NACOS_DEV_ADDR = "127.0.0.1:8848";
    String NACOS_DEV_ADDR = "127.0.0.1:18848";
    /**
     * nacos prod åœ°å€
     */
    String NACOS_PROD_ADDR = "172.30.0.48:8848";
    String NACOS_PROD_ADDR = "127.0.0.1:8848";
    /**
     * nacos test åœ°å€
     */
    String NACOS_TEST_ADDR = "172.30.0.48:8848";
    String NACOS_TEST_ADDR = "127.0.0.1:8848";
    /**
     * sentinel dev åœ°å€
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineGroupService.java
ÎļþÒÑɾ³ý
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/MachineService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
package org.springblade.mdm.basesetting.machine;
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.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.mapper.MachineMapper;
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.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
public class MachineService extends BizServiceImpl<MachineMapper, Machine> {
    @Transactional
    public void saveMachine(MachineSaveVO vo){
        //TODO
        Machine machine = new Machine();
        BeanUtil.copyProperties(vo, machine);
        this.save(machine);
    }
    public boolean updateMachine(MachineSaveVO vo) {
        Machine machine = this.getById(vo.getId());
        machine.setMachineSpec(vo.getMachineSpec());
        return this.updateById(machine);
    }
    @Transactional
    public void removeMachines(List<Long> ids) {
        for(Long id : ids){
            this.removeById(id);
        }
    }
    public IPage<MachineVO> pageQuery(MachineQueryVO query) {
        LambdaQueryWrapper<Machine> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(query.getMachineGroupId()!=null, Machine::getMachineGroupId, query.getMachineGroupId());
        IPage<MachineVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),queryWrapper);
        return page;
    }
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
Îļþ´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java ¸´ÖÆ
@@ -10,30 +10,31 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineGroupService;
import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
import org.springblade.mdm.basesetting.machine.MachineService;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Slf4j
@RestController
@RequestMapping("/machinegroup")
@Tag(name = "机床组", description = "机床组")
public class MachineGroupController {
@RequestMapping("/machine")
@Tag(name = "机床", description = "机床")
public class MachineController {
    @Autowired
    private MachineGroupService grpService;
    private MachineService service;
    /**
     * æ–°å¢ž
     */
    @PostMapping("/save")
    @Operation(summary = "新增", description = "机床组信息")
    public R<Boolean> save(@RequestBody MachineGroup grp) {
    public R<Boolean> save(@RequestBody MachineSaveVO vo) {
        return R.<Boolean>status(grpService.save(grp));
        service.saveMachine(vo);
        return R.<Boolean>status(true);
    }
    /**
@@ -41,9 +42,9 @@
     */
    @Operation(summary = "修改", description = "机床组信息")
    @PostMapping("/update")
    public R<Boolean> update(@RequestBody MachineGroup grp) {
    public R<Boolean> update(@RequestBody MachineSaveVO vo) {
        return R.<Boolean>status(grpService.updateById(grp));
        return R.<Boolean>status(service.updateMachine(vo));
    }
    /**
@@ -53,7 +54,7 @@
    @PostMapping("/remove")
    public R<Void> remove(@RequestParam String ids) {
        try {
            grpService.removeGroups(Func.toLongList(ids));
            service.removeMachines(Func.toLongList(ids));
        } catch (Exception e) {
            log.error("删除异常",e);
            return R.fail(e.getMessage());
@@ -66,8 +67,8 @@
     */
    @Operation(summary = "分页查询", description = "名称或编码")
    @GetMapping("/page")
    public R<IPage<MachineGroup>> page(String keyword, Query query) {
    public R<IPage<MachineVO>> page(MachineQueryVO query) {
        /*
        LambdaQueryWrapper<MachineGroup> wrapper = new LambdaQueryWrapper<>();
        //wrapper.like(StringUtils.isNotBlank(keyword),MachineGroup::getName, "%"+keyword+"%");
        wrapper.and(StringUtils.isNotBlank(keyword),(w1)->{
@@ -75,7 +76,9 @@
                .or().like(MachineGroup::getCode,"%"+keyword+"%");
        });
        IPage<MachineGroup> pages = grpService.page(Condition.getPage(query), wrapper);
         */
        IPage<MachineVO> pages = service.pageQuery(query);
        return R.data(pages);
    }
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/Machine.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
package org.springblade.mdm.basesetting.machine.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.base.BizEntity;
@Setter
@Getter
@TableName("mdm_machine")
public class Machine extends BizEntity {
    private String name;
    private String code;
    /**
     * æ‰€å±žæœºåºŠç»„ID
      */
    private Long machineGroupId;
    /**
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置(key=machine_spec)
     */
    private String machineSpec;
    /**
     * æ“ä½œå‘˜ï¼Œæ–‡æœ¬å½•å…¥
     */
    private String operator;
    /**
     * æ‰€å±žå•位/组织
     */
    private Long ownerDept;
    /**
     * '生产商'
     */
    private String manufacturer;
    /**
     * æ£€æŸ¥ç¨‹åºå›žä¼ çš„轮询时间(小时)
     */
    private Integer pollingHours;
    /**
     * æŽ§åˆ¶ç³»ç»Ÿï¼ˆå¦‚发那科),在业务字典配置(key=machine_controll_system),使用英文字母
     */
    private String controlSystem;
    /**
     * ç¨‹åºä¸‹å‘目录
     */
    private String progSendDir;
    /**
     * ç¨‹åºå›žä¼ ç›®å½•',
     */
    private String progReceiveDir;
    /**
     * å¤‡æ³¨
     */
    private String remark;
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.java
ÎļþÒÑɾ³ý
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
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;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
public interface MachineMapper extends BladeMapper<Machine> {
    IPage<MachineVO> pageQuery(IPage<Machine> page, @Param(Constants.WRAPPER)LambdaQueryWrapper<Machine> queryWrapper);
    //pageMachine
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
copy from blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml copy to blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineMapper.xml
Îļþ´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml ¸´ÖÆ
@@ -1,9 +1,9 @@
<?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.machine.mapper.MachineGroupMapper">
<mapper namespace="org.springblade.mdm.basesetting.machine.mapper.MachineMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.MachineGroup">
    <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.Machine">
        <id column="id" property="id"/>
        <result column="code" property="code"/>
        <result column="name" property="name"/>
@@ -13,6 +13,11 @@
        <result column="updateTime" property="update_time"/>
        <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.name group_name,m.machine_spec,m.manufacturer,m.operator
        from mdm_machine m join mdm_machine_group g on m.machine_group_id=g.id
            ${ew.customSqlSegment}
    </select>
<!--    <select id="parentTree" resultMap="treeNodeResultMap">-->
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineQueryVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package org.springblade.mdm.basesetting.machine.vo;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.support.Query;
@Setter
@Getter
public class MachineQueryVO extends Query {
    private String keyword;
    private Long machineGroupId;
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineSaveVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package org.springblade.mdm.basesetting.machine.vo;
import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;
@Setter
@Getter
public class MachineSaveVO extends BaseVO {
    private String code;
    private String name;
    /**
     * æ‰€å±žæœºåºŠç»„ID
     */
    private Long machineGroupId;
    /**
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置(key=machine_spec)
     */
    private String machineSpec;
    /**
     * æ“ä½œå‘˜ï¼Œæ–‡æœ¬å½•å…¥
     */
    private String operator;
    /**
     * æ‰€å±žå•位/组织
     */
    private Long ownerDept;
    /**
     * '生产商'
     */
    private String manufacturer;
    /**
     * æ£€æŸ¥ç¨‹åºå›žä¼ çš„轮询时间(小时)
     */
    private Integer pollingHours;
    /**
     * æŽ§åˆ¶ç³»ç»Ÿï¼ˆå¦‚发那科),在业务字典配置(key=machine_controll_system),使用英文字母
     */
    private String controlSystem;
    /**
     * ç¨‹åºä¸‹å‘目录
     */
    private String progSendDir;
    /**
     * ç¨‹åºå›žä¼ ç›®å½•',
     */
    private String progReceiveDir;
    private String remark;
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/vo/MachineVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
package org.springblade.mdm.basesetting.machine.vo;
import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;
@Setter
@Getter
public class MachineVO extends BaseVO {
    private String code;
    private String name;
    /**
     * æ‰€å±žæœºåºŠç»„ID
     */
    private Long machineGroupId;
    /**
     * æœºå™¨è§„æ ¼:01车床/02铣床,在业务字典配置(key=machine_spec)
     */
    private String machineSpec;
    /**
     * æ“ä½œå‘˜ï¼Œæ–‡æœ¬å½•å…¥
     */
    private String operator;
    /**
     * æ‰€å±žå•位/组织
     */
    private Long ownerDept;
    /**
     * '生产商'
     */
    private String manufacturer;
    /**
     * æ£€æŸ¥ç¨‹åºå›žä¼ çš„轮询时间(小时)
     */
    private Integer pollingHours;
    /**
     * æŽ§åˆ¶ç³»ç»Ÿï¼ˆå¦‚发那科),在业务字典配置(key=machine_controll_system),使用英文字母
     */
    private String controlSystem;
    /**
     * ç¨‹åºä¸‹å‘目录
     */
    private String progSendDir;
    /**
     * ç¨‹åºå›žä¼ ç›®å½•',
     */
    private String progReceiveDir;
    private String remark;
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/MachineGroupService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.springblade.mdm.basesetting.machinegroup;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup;
import org.springblade.mdm.basesetting.machinegroup.mapper.MachineGroupMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
public class MachineGroupService extends BizServiceImpl<MachineGroupMapper, MachineGroup> {
    @Transactional
    public void removeGroups(List<Long> ids){
        //TODO æ£€æŸ¥ä¸‹é¢æ˜¯å¦æœ‰æœºå™¨
        for(Long id : ids){
            this.removeById(id);
        }
    }
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/controller/MachineGroupController.java
ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineGroupController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package org.springblade.mdm.basesetting.machine.controller;
package org.springblade.mdm.basesetting.machinegroup.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,12 +10,11 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineGroupService;
import org.springblade.mdm.basesetting.machine.entity.MachineGroup;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machinegroup.MachineGroupService;
import org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Slf4j
@RestController
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/entity/MachineGroup.java
ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/entity/MachineGroup.java ÐÞ¸Ä
@@ -1,10 +1,11 @@
package org.springblade.mdm.basesetting.machine.entity;
package org.springblade.mdm.basesetting.machinegroup.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import org.springblade.core.mp.base.BaseEntity;
import org.springblade.core.mp.base.BizEntity;
@TableName("mdm_machine_group")
public class MachineGroup extends BaseEntity {
public class MachineGroup extends BizEntity {
    private String name;
    private String code;
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package org.springblade.mdm.basesetting.machinegroup.mapper;
import org.springblade.core.mp.mapper.BladeMapper;
import org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup;
public interface MachineGroupMapper extends BladeMapper<MachineGroup> {
}
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machinegroup/mapper/MachineGroupMapper.xml
ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/mapper/MachineGroupMapper.xml ÐÞ¸Ä
@@ -1,9 +1,9 @@
<?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.machine.mapper.MachineGroupMapper">
<mapper namespace="org.springblade.mdm.basesetting.machinegroup.mapper.MachineGroupMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machine.entity.MachineGroup">
    <resultMap id="BaseResultMap" type="org.springblade.mdm.basesetting.machinegroup.entity.MachineGroup">
        <id column="id" property="id"/>
        <result column="code" property="code"/>
        <result column="name" property="name"/>
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/vo/BaseVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package org.springblade.mdm.commons.vo;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
@Setter
@Getter
public class BaseVO {
    private Long id;
    private Integer status;
    private Date createTime;
}
doc/sql/mdm/mdm.all.create.sql
@@ -1,8 +1,8 @@
CREATE TABLE `mdm_machine_group` (
  `id` bigint NOT NULL COMMENT '主键',
  `tenant_id` varchar(12) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '000000' COMMENT '租户ID',
  `name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机床组名称',
  `code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机床组编号',
  `name` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '机床组名称',
  `code` varchar(20) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '机床组编号',
  `create_user` bigint DEFAULT NULL COMMENT '创建人',
  `create_dept` bigint DEFAULT NULL COMMENT '创建部门',
  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
@@ -11,26 +11,35 @@
  `status` int DEFAULT '1' COMMENT '状态',
  `is_deleted` int DEFAULT '0' COMMENT '是否已删除',
  PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='机床组';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='机床组';
CREATE TABLE `mdm_machine` (
  `id` bigint NOT NULL,
  `tenant_id` varchar(6) DEFAULT NULL COMMENT '所属租户',
  `code` varchar(100) NOT NULL COMMENT '机床编号',
  `name` varchar(100) CHARACTER SET gbk COLLATE gbk_chinese_ci NOT NULL COMMENT '机床名称',
  `avatar` varchar(1000) DEFAULT NULL COMMENT '图片地址',
  `machine_group_id` bigint DEFAULT NULL COMMENT '所属机床组ID',
  `status` int DEFAULT NULL COMMENT '业务状态',
  `name` varchar(100) NOT NULL COMMENT '机床描述/型号',
  `avatar` varchar(400) DEFAULT NULL COMMENT '图片地址',
  `machine_group_id` bigint NOT NULL COMMENT '所属机床组ID',
  `machine_spec` varchar(20) DEFAULT NULL COMMENT '机器规格:01车床/02铣床,在业务字典配置(key=machine_spec)',
  `operator` varchar(100)  COMMENT '操作员,文本录入',
  `owner_dept` bigint DEFAULT NULL COMMENT '所属单位/组织',
  `manufacturer` varchar(100)  COMMENT '生产商',
  `polling_hours` int(11) COMMENT '检查程序回传的轮询时间(小时)',
  `control_system` varchar(20) DEFAULT NULL COMMENT '控制系统(如发那科),在业务字典配置(key=machine_controll_system),使用英文字母',
  `prog_send_dir` varchar(100)  COMMENT '程序下发目录',
  `prog_receive_dir` varchar(100)  COMMENT '程序回传目录',
  `remark` varchar(200)  COMMENT '备注',
  `status` int DEFAULT NULL COMMENT '业务状态,1:启用;0禁用',
  `create_dept` bigint DEFAULT NULL COMMENT '创建单位',
  `is_deleted` int DEFAULT NULL,
  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
  `create_user` bigint DEFAULT NULL COMMENT '创建人',
  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
  `update_user` bigint DEFAULT NULL COMMENT '更新人'
  `update_user` bigint DEFAULT NULL COMMENT '更新人',
  PRIMARY KEY (`id`) USING BTREE,
  UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE,
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='机床';
  UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='机床';
CREATE TABLE `mdm_nc_program` (
@@ -50,7 +59,7 @@
  `update_user` bigint DEFAULT NULL COMMENT '更新人'
  PRIMARY KEY (`id`) USING BTREE,
  UNIQUE KEY `uniqueCodeIndex` (`code`,`is_deleted`) USING BTREE,
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='数控程序';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='数控程序';
CREATE TABLE `mdm_task_receive` (