1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置

lyh

2025-06-06 0871a25215fb468f121785600f796a14b54d8ebc

1.刀具添加字段
2.新增dnc传输日志表
3.导入NC文件默认产生nc文件对应数控程序加工确认表
4.拆分两网 修改yml配置

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/Cutter.java

@@ -38,6 +38,11 @@
    @TableField(value = "doc_id")
    private String docId;

    //对应刀具库id
    @Excel(name = "对应刀具库id", width = 15)
    @TableField(value = "tools_id")
    private String toolsId;

    //刀具名称
    @Excel(name = "刀具名称", width = 15)
    @TableField(value = "cutter_name")
@@ -48,8 +53,8 @@
    @TableField(value = "cutter_code")
    private String cutterCode;

    //刀具类型
    @Excel(name = "刀具类型", width = 15,dicCode = "cutter_type")
    //刀具简称
    @Excel(name = "刀具简称", width = 15,dicCode = "cutter_type")
    @TableField(value = "cutter_type")
    @Dict(dicCode = "cutter_type")
    private String cutterType;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DncPassLog.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package org.jeecg.modules.dnc.entity;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.Date;

/**
 * @author clown
 * * @date 2023/11/29
 */
@Data
@NoArgsConstructor
@TableName(value = "dnc_pass_log")
public class DncPassLog {
    @TableId
    private String id;
    //名称
    private String passName;
    //序号
    private String sequenceOrder;
    //时间
    private String dayTime;
    //类型
    private String passType;
    // æ–‡ä»¶åç§°
    private String passLogFileName;
    //顺序号
    private Integer sequenceNumber;

    private Date createTime;


}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DncPassLogMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package org.jeecg.modules.dnc.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.dnc.entity.DncPassLog;

/**
 * @author clown
 * * @date 2023/11/29
 */
public interface DncPassLogMapper extends BaseMapper<DncPassLog> {
    /**
     * æŸ¥è¯¢æŸä¸€å¤©æœ€åŽä¸€æ¡è®°å½•
     * @param dayTime
     * @return
     */
    DncPassLog findDateTimeDay(@Param("dayTime")String dayTime);
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/MdcPassLogMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +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.jeecg.modules.dnc.mapper.DncPassLogMapper">
    <select id="findDateTimeDay" resultType="org.jeecg.modules.dnc.entity.DncPassLog" parameterType="String">
        select top 1 *
        from dnc_pass_log u
        where day_time = #{dayTime} order by create_time desc
    </select>
</mapper>

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/response/DocumentCode.java

@@ -31,7 +31,8 @@
    DOC_UPLOAD_ERROR(false, 25323, "文档导入失败！"),
    DOC_DEL_ERROR(false, 25324, "该文档无法删除！"),
    DOC_IS_EXIST(false, 25325, "该文档已存在！"),
    DOC_DEVICE_EXIST(false, 25326, "该文档有设备关联信息！");
    DOC_DEVICE_EXIST(false, 25326, "该文档有设备关联信息！"),
    DOC_BATCH_ERROR(false, 25327, "导入文档新增批次失败，请重试！");

    //操作代码
    @ApiModelProperty(value = "操作是否成功", example = "true", required = true)
@@ -43,7 +44,7 @@
    //提示信息
    @ApiModelProperty(value = "操作提示", example = "操作过于频繁！", required = true)
    String message;
    private DocumentCode(boolean success, int code, String message){
    DocumentCode(boolean success, int code, String message){
        this.success = success;
        this.code = code;
        this.message = message;

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDncPassLogService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.dnc.service;

import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dnc.entity.DncPassLog;

/**
 * @author clown
 * * @date 2023/11/29
 */
public interface IDncPassLogService extends IService<DncPassLog> {

    /**
     * æŸ¥è¯¢æŸä¸€å¤©çš„数据
     * @param dateDay
     * @return
     */
    DncPassLog findDayTime(String dateDay);

}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IGuideCardBatchService.java

@@ -17,4 +17,11 @@
     * @return
     */
    String getSerialNumber(String code);

    /**
     * å¯¼å…¥NC文件默认产生nc文件对应数控程序加工确认表
     * @param docId
     * @return
     */
    boolean importGuideCardBatch(String docId,String attributionId,Integer attributionType);
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DncPassLogServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package org.jeecg.modules.dnc.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.dnc.entity.DncPassLog;
import org.jeecg.modules.dnc.mapper.DncPassLogMapper;
import org.jeecg.modules.dnc.service.IDncPassLogService;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.springframework.stereotype.Service;
/**
 * @author clown
 * * @date 2023/11/29
 */
@Service
public class DncPassLogServiceImpl extends ServiceImpl<DncPassLogMapper, DncPassLog> implements IDncPassLogService {

    @Override
    public DncPassLog findDayTime(String dateDay) {
        if (!ValidateUtil.validateString(dateDay)) {
            return null;
        }
        return super.baseMapper.findDateTimeDay(dateDay);
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java

@@ -67,6 +67,9 @@
    @Autowired
    @Lazy
    private IComponentInfoService componentInfoService;
    @Autowired
    @Lazy
    private IGuideCardBatchService guideCardBatchService;

    /*备份处理*/
    @Override
@@ -176,6 +179,12 @@
                }
            }
        }
        if (uploadRequest.getDocClassCode().equals("NC")){
            boolean savaGuideCardBatch=guideCardBatchService.importGuideCardBatch(docInfo.getDocId(),uploadRequest.getAttributionId(),uploadRequest.getAttributionType());
            if (!savaGuideCardBatch) {
                ExceptionCast.cast(DocumentCode.DOC_BATCH_ERROR);
            }
        }
        return saveBool;
    }


 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/GuideCardBatchServiceImpl.java

@@ -5,12 +5,14 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.dnc.entity.GuideCardBatch;
import org.jeecg.modules.dnc.constant.DocAttributionTypeEnum;
import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.mapper.GuideCardBatchMapper;
import org.jeecg.modules.dnc.service.IGuideCardBatchService;
import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;
@@ -27,6 +29,24 @@
    @Autowired
    private ISysDictService sysDictService;

    @Autowired
    private IDocInfoService docInfoService;

    @Autowired
    private IDocRelativeService docRelativeService;

    @Autowired
    private IPartsInfoService partsInfoService;

    @Autowired
    private IProcessStreamService processStreamService;

    @Autowired
    private IWorkStepService workStepService;

    @Autowired
    private IDeviceTypeService deviceTypeService;

    /**
     * ç”Ÿæˆæµæ°´å·
     * @param code
@@ -42,9 +62,9 @@

        // æŸ¥è¯¢å½“年所有记录
        QueryWrapper<GuideCardBatch> wrapper = new QueryWrapper<>();
        wrapper.likeRight("create_time", DateUtils.formatDate(new Date(), "yyyy"));
        wrapper.apply("YEAR(create_time) = YEAR(GETDATE())");
        wrapper.isNotNull("serial_number");
        wrapper.orderByDesc("SUBSTR(serial_number, -4)");
        wrapper.orderByDesc("SUBSTRING(serial_number, LEN(serial_number)-3, 4)");

        List<GuideCardBatch> list = this.list(wrapper);

@@ -62,10 +82,65 @@
            serialSuffix = "0001"; // å½“年无记录则初始化
        }

        // èŽ·å–单位编码
        String unitCode = sysDictService.queryDictTextByKey("unit_code", code);

        // æ‹¼æŽ¥å®Œæ•´ç¼–号
        return yearSuffix + unitCode + user.getUsername() + serialSuffix;
        return yearSuffix + code + user.getUsername() + serialSuffix;
    }

    /**
     * å¯¼å…¥NC文件默认产生nc文件对应数控程序加工确认表
     * @param docId
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean importGuideCardBatch(String docId,String attributionId,Integer attributionType){
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        DocInfo docInfo=docInfoService.getById(docId);
        if (docInfo==null){
            return false;
        }
        PartsInfo partsInfo=new PartsInfo();
        ProcessStream processStream;
        WorkStep workStep;
        DeviceType deviceType;
        GuideCardBatch guideCardBatch=new GuideCardBatch();
        if (DocAttributionTypeEnum.PROCESS.getCode().equals(attributionType)){
            //工序设备类
            deviceType=deviceTypeService.getById(attributionId);
            if (deviceType==null){
                return false;
            }
            processStream=processStreamService.getById(deviceType.getAttributionId());
            if (processStream==null){
                return false;
            }
            guideCardBatch.setProcessWorkCode(processStream.getProcessCode());
            partsInfo=partsInfoService.getById(processStream.getPartsId());
        }else if (DocAttributionTypeEnum.WORKSITE.getCode().equals(attributionType)){
            //工步设备类
            deviceType=deviceTypeService.getById(attributionId);
            if (deviceType==null){
                return false;
            }
            workStep=workStepService.getById(deviceType.getAttributionId());
            if (workStep==null){
                return false;
            }
            guideCardBatch.setProcessWorkCode(workStep.getStepCode());
            partsInfo=partsInfoService.getById(workStep.getPartsId());
        }
        if (partsInfo==null){
            return false;
        }
        guideCardBatch.setDocId(docId);
        guideCardBatch.setSerialNumber(getSerialNumber("C140"));
        guideCardBatch.setUnit(sysDictService.queryDictTextByKey("unit_code", "C140"));
        guideCardBatch.setDocName(docInfo.getDocName());
        guideCardBatch.setPartsCode(partsInfo.getPartsCode());
        guideCardBatch.setPartsName(partsInfo.getPartsName());
        guideCardBatch.setMaterielDesp(partsInfo.getMaterielDesp());
        guideCardBatch.setCompiler(user.getUsername());
        guideCardBatch.setCreateTime(new Date());
        return this.save(guideCardBatch);
    }
}

 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignFileStreamServiceImpl.java

@@ -44,6 +44,7 @@
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.message.enums.DeployEnum;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -103,11 +104,14 @@
    private IFlowMyBusinessService flowMyBusinessService;
    @Autowired
    private PermissionService permissionService;

    @Value("${securedoc.whether}")
    private String whether;
    @Value("${securedoc.localFilePath}")
    private String localFilePath;
    @Autowired
    private IDncPassLogService dncPassLogService;
    @Value("${deploy.deployType}")
    //工控网/涉密网部署 0为工控网 1为涉密网
    private String deployType;
    @Value("${deploy.secretFolder}")
    //涉密网传输nc文件夹
    private String secretFolder;

    @Override
    @Transactional(rollbackFor = {Exception.class})
@@ -258,7 +262,10 @@

        }
        handleFileTransfer(mdcEquipment, docFile);
        handleFileProcessing(docFile, mdcEquipment, whether, localFilePath);
        //注意----区分工控网与涉密网！！！  æ¶‰å¯†ç½‘进行NC文件的拷贝，工控网负责进行解析NC文件
        if (deployType.equals(DeployEnum.SMW.getCode())) {
            handleFileProcessing(docFile, mdcEquipment, secretFolder);
        }
        synchronizedFlagService.updateFlag(2);
        return Result.OK("操作成功");
    }
@@ -380,6 +387,10 @@
                                docFile.getFileName(),docFile.getFileSuffix());
                    }
                }
            }
            //注意----区分工控网与涉密网！！！  æ¶‰å¯†ç½‘进行NC文件的拷贝，工控网负责进行解析NC文件
            if (deployType.equals(DeployEnum.SMW.getCode())) {
                handleFileProcessing(docFile, mdcEquipment, secretFolder);
            }
            return synchronizedFlagService.updateFlag(1);
        }else if(up.getStatus() == 3) {
@@ -650,22 +661,61 @@
    }

    //封装处理文件
    private void handleFileProcessing(DocFile docFile, MdcEquipment mdcEquipment, String whether, String localFilePath) {
        if (whether.equals("true") && !docFile.getFileSuffix().equals("zip") && !docFile.getFileSuffix().equals("rar")) {
    private void handleFileProcessing(DocFile docFile, MdcEquipment mdcEquipment, String secretFolder) {
        if (!docFile.getFileSuffix().equals("zip") && !docFile.getFileSuffix().equals("rar")) {
            String size = FileUtilS.fileSizeNC(docFile.getFilePath(), docFile.getFileEncodeName());
            List<String> strings = iMdcProductionService.findListParentTreeAll(mdcEquipment.getId());
            if (strings != null && !strings.isEmpty()) {
                DncPassLog passInfoTxt = new DncPassLog();

                String path = StringUtils.join(strings.toArray(), "/");
                Date dateFirst = DateUtil.getNow();
                passInfoTxt.setDayTime(DateUtil.format(dateFirst,DateUtil.STR_YEARMONTHDAY));
                /*查询最后一条记录*/
                //休眠 500毫秒
                DncPassLog dncPassLog  = dncPassLogService.findDayTime(DateUtil.format(dateFirst,DateUtil.STR_YEARMONTHDAY));
                int fileTxt = 0, fileNc =0;
                if (dncPassLog !=null) {
                    fileTxt = dncPassLog.getSequenceNumber() + 1;
                } else {
                    fileTxt =  1;
                }
                fileNc = fileTxt + 1;
                //处理文件名称  æ–‡ä»¶è·¯å¾„
                String sequence = String.format("%06d",fileTxt);
                String sequenceNc = String.format("%06d",fileNc);
                passInfoTxt.setSequenceNumber(fileTxt);
                passInfoTxt.setSequenceOrder(sequence);
                passInfoTxt.setCreateTime(dateFirst);
                System.out.println(DateUtil.format(dateFirst,DateUtil.STR_DATE_TIME));
                passInfoTxt.setPassType("02");
                dncPassLogService.save(passInfoTxt);

                DncPassLog passInfoNc = new DncPassLog();
                passInfoNc.setSequenceNumber(fileNc);
                passInfoNc.setSequenceOrder(sequenceNc);
                passInfoNc.setDayTime(DateUtil.format(dateFirst,DateUtil.STR_YEARMONTHDAY));
                passInfoNc.setPassType("02");
                passInfoNc.setPassName(docFile.getFileName());
                try {
                    Thread.sleep(1000);
                    Date date = new Date();
                    passInfoNc.setCreateTime(date);
                    System.out.println(DateUtil.format(date,DateUtil.STR_DATE_TIME));
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }

                dncPassLogService.save(passInfoNc);
                NcTxtFilePathInfo ncTxt = new NcTxtFilePathInfo();
                ncTxt.setEquipmentId(mdcEquipment.getEquipmentId());
                ncTxt.setFileNcName("02A" + DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY));
                ncTxt.setFileTxtName("02A" + DateUtil.format(dateFirst, DateUtil.STR_YEARMONTHDAY));
                ncTxt.setFileNcName("10A"+DateUtil.format(dateFirst,DateUtil.STR_YEARMONTHDAY)+sequenceNc);
                ncTxt.setFileTxtName("10A"+DateUtil.format(dateFirst,DateUtil.STR_YEARMONTHDAY)+sequence);
                ncTxt.setFilePath(path + "/" + mdcEquipment.getEquipmentId() + "/");
                ncTxt.setOrigFileName(docFile.getFileName());
                ncTxt.setOrigFileSuffix(docFile.getFileSuffix());
                ncTxt.setFileAddOrDelete(1);
                String loFilePath = localFilePath + ncTxt.getFileTxtName() + ".nc";
                String loFilePath = secretFolder +"/"+ ncTxt.getFileTxtName() + ".nc";
                try {
                    String allList = ncTxt.getFileTxtName() + "\n"
                            + ncTxt.getFileNcName() + "\n"
@@ -678,7 +728,7 @@
                    FileUtilS.fileWriterSql(loFilePath, allList);
                    boolean copyFileNc = FileUtilS.copyFileUpName(path + "/" + mdcEquipment.getEquipmentId() + "/send/" +
                                    docFile.getFileName(),
                            localFilePath + ncTxt.getFileNcName(),
                            secretFolder +"/"+ncTxt.getFileNcName(),
                            docFile.getFileSuffix(), "NC");
                    if (!copyFileNc) {
                        FileUtilS.deleteNcFile(loFilePath);

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/message/enums/DeployEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package org.jeecg.modules.message.enums;

/**
 * åŒºåˆ†å·¥æŽ§ç½‘/涉密网部署相关配置
 */
public enum DeployEnum {
    SMW("0", "涉密网"),
    GW("1", "工控网");

    private String code;
    private String name;

    public String getName() {
        return name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    DeployEnum() {
    }

    DeployEnum(String code, String name) {
        this.code = code;
        this.name = name;
    }
}

 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml

@@ -135,7 +135,7 @@
    database: 0
    host: 127.0.0.1
    port: 6379
    password: ''
    password: '123456'
flowable:
  enable: true
  #关闭定时任务JOB
@@ -298,35 +298,6 @@
  namespace: http://service.server.webservice.example.com
  statusMethod: equipmentStatus
  rateMethod: equipmentRate
securedoc: #园区网与网闸通讯客户端
  whether: true  #是否启用 true / false
  serverIp: 10.118.10.63  #数据服务端IP
  serverPort: 8399  #数据服务端接口
  #  serverIp: 127.0.0.1  #数据服务端IP
  #  serverPort: 8399  #数据服务端接口
  username: admin  #定义账号
  pwd: 123 #定义密码
  addressToken: /outer/appAuth #服务段获取token地址
  addressUploadFile: /outer/fileUpload #服务段上传地址
  localFilePath: E:\\test\\a #接收地址
  servicePath: E:\\test\\b #发送地址
  copyFilePath: E:\\test\\bak_a  #文件备份地址
  #  localFilePath: /jar/test/a/ #接收地址
  #  servicePath: /jar/test/b/ #发送地址
  #  copyFilePath: /jar/test/bak_a/  #文件备份地址
  logIp: 127.0.0.1  #日志系统地址
  logPort: 8888   #日志系统端口
serviceIntranet: #园区网与网闸通讯服务段
  #  filePath: E:\\test\\b   #集成客户端保存地址
  #  newFilePath: E:/test/bak_sql/ #文件备份地址
  filePath: /jar/test/b/   #集成客户端保存地址
  newFilePath: /jar/test/bak_sql/ #文件备份地址
  appIdCheck: admin  #token ç”¨æˆ·å
  passwordCheck: 123 #token å¯†ç 
  logIp: 127.0.0.1
  logPort: 8888
  clientIp: 127.0.0.1  #客户端IP
fileNumPath: D:/demo/fileNum.txt  #顺序号记录地址
#文件上传目录（注意Linux和Windows上的目录结构不同）
#file.uploadFolder=/root/uploadFiles/
#fileHomePath: ${UPLOAD_FOLDER:/jar/lxzn_storage}
@@ -336,3 +307,11 @@
ncSend:
  addOrDelete: false  #//是否删除seed ä¸­çš„之前文件
#staticAccessPath: /api/ffile/** # å½“前项目的静态资源访问配置在nginx中
#工控网/涉密网部署相关配置------------通过光盘摆渡
deploy:
    #工控网/涉密网部署 0为涉密网 1为工控网
    deployType: 0
    #涉密网传输nc文件夹
    secretFolder: D:\\hy_test\\a
    #工控网监控nc文件夹
    workFolder: D:\\hy_test\\b