db/lxzn_qlj_nc.sql

ÎļþÌ«´ó

 pom.xml

@@ -73,6 +73,7 @@
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <version>8.0.33</version>
            <scope>runtime</scope>
        </dependency>



 src/main/java/com/lxzn/base/controller/ServiceOuterController.java

@@ -43,10 +43,10 @@
    @Autowired
    private IDncPassLogService dncPassLogService;

    @RequestMapping("/nc")
    public void fileClientTxtOrNc() {
        dncPassLogService.fileClientTxtOrNc();
    }
//    @RequestMapping("/nc")
//    public void fileClientTxtOrNc() {
//        dncPassLogService.fileClientTxtOrNc();
//    }

    @Value("${serviceIntranet.appIdCheck}")
    private String appIdCheck;

 src/main/java/com/lxzn/base/service/IDncPassLogService.java

@@ -17,15 +17,15 @@
     * @return
     */
    DncPassLog findDayTime(String dateDay);

    /**
     * å‘送文件
     */
    void fileClientTxtOrNc();

    /**
     * åˆ é™¤å›ºå®šè·¯å¾„下超时文件
     * @return
     */
    void deleteNcSendFile();
//
//    /**
//     * å‘送文件
//     */
//    void fileClientTxtOrNc();
//
//    /**
//     * åˆ é™¤å›ºå®šè·¯å¾„下超时文件
//     * @return
//     */
//    void deleteNcSendFile();
}

 src/main/java/com/lxzn/base/service/IReceiveFileService.java

@@ -6,8 +6,8 @@
 */
public interface IReceiveFileService {

    /**
     * è§£æžæ•°æ®
     */
    void analysisAndCopyFileRec();
//    /**
//     * è§£æžæ•°æ®
//     */
//    void analysisAndCopyFileRec();
}

 src/main/java/com/lxzn/base/service/impl/DncPassLogServiceImpl.java

@@ -79,209 +79,209 @@
        return super.baseMapper.findDateTimeDay(dateDay);
    }

    @Override
    @Scheduled(cron = "${fileCron}")
    public void fileClientTxtOrNc() {
        SysLogMessageDto message = new SysLogMessageDto();
        String host = "127.0.0.1";
        if (StringUtils.isNotBlank(serverIp)) {
            host = serverIp;
        }
        String port = "8299";
        if (StringUtils.isNotBlank(serverPort)) {
            port = serverPort;
        }
        String username = "admin";
        if (StringUtils.isNotBlank(usernameService)) {
            username = usernameService;
        }
        String pwd = "123";
        if (StringUtils.isNotBlank(pwdService)) {
            pwd = pwdService;
        }
        //文件本地地址，根据地址找到文件，将文件解析成文件流
        String localFilePath = "E:\\test\\a\\";
        if (StringUtils.isNotBlank(localFilePathC)) {
            localFilePath = localFilePathC;
        }
        //文件上传目的地址，将文件上传到该地址
        String servicePath = "E:\\test\\b\\";
        if (StringUtils.isNotBlank(servicePathS)) {
            servicePath = servicePathS;
        }
        boolean btelnetPort =  TelnetUtil.telnetPort(serverIp,Integer.valueOf(serverPort),10);
        if (!btelnetPort) {
            System.out.println("服务器连接： " + serverIp + ":" + serverPort + " å¼‚常！" );
            return;
        }
        //第一步，获取token
        String token = null;
        try {
            token = FileClient.getToken(host,port,username,pwd,addressToken);
        } catch (Throwable throwable) {
            throwable.printStackTrace();
        }

        //若获取token成功，再进行上传文件接口调用
        if (token !=null && !token.equals("")){
            try {
                File f3 = new File(localFilePath);
                File[] files = f3.listFiles();
                for (File fi : files){
                    if (fi.isFile()){
                        SysLogTypeObjectDto objectName = new SysLogTypeObjectDto();
                        objectName.setDateTime(DateUtil.format(DateUtil.getNow(),DateUtil.STR_DATE_TIME_SMALL));
                        objectName.setFileName(fi.getName());
                        objectName.setFileSize(FileUtil.changeFileFormatKb(String.valueOf(new File(localFilePath).length())));
                        objectName.setSourceAddress(localFilePath);
                        objectName.setDestination(serverIp);//服务端IP
                        //顺序号
                        DncPassLog passLog = getById("num0001");
                        if (passLog == null) {
                            passLog = new DncPassLog();
                            passLog.setId("num0001");
                            passLog.setSequenceNumber(1);
                            objectName.setFileNum(Integer.toString(1));
                            save(passLog);
                        } else {
                            Integer number = passLog.getSequenceNumber()+1;
                            removeById("num0001");
                            objectName.setFileNum(Integer.toString(number));

                            passLog = new DncPassLog();
                            passLog.setId("num0001");
                            passLog.setSequenceNumber(number);
                            save(passLog);
                        }

                        InetAddress address = null;
                        try {
                            address = InetAddress.getLocalHost();
                            String ip = address.getHostAddress();
                            objectName.setSourceAddress("20.10.17.11");//客户端IP
                            objectName.setAddress(ip);
                        } catch (UnknownHostException e) {
                            objectName.setSourceAddress("127.0.0.1");
                            objectName.setAddress("127.0.0.1");
                        }
                        objectName.setDestination(host);
                        objectName.setResult("失败");
                        //获取某个文件下的所有文件
                        String loFilePath = localFilePath + fi.getName();
                        String servicePathName =servicePath+"//" + fi.getName();
                        File file = new File(loFilePath);
                        if (file == null || !file.exists()){
                            objectName.setAbstract1("sm3");
                        } else {
                            String sm3 = SmUtil.sm3(file);
                            objectName.setAbstract1(sm3);
                        }

                        String b  = FileClient.uploadFile(host,port,token,fi.getName(),servicePathName,loFilePath,addressUploadFile);
                        //文件备份删除
                        if (b == null) {
                            try {
                                objectName.setResult("失败");
                                objectName.setTypes("error");
                                SyslogClient.sendClient(logIp,Integer.valueOf(logPort),objectName.toString());
                            }catch (Exception e) {
                                return;
                            }
                        }
                        else if ( b.equals("成功")) {
                            //备份数据
                            boolean fCopy = FileUtil.copyNcFile(loFilePath,newFilePathC + "/" + DateUtil.format(DateUtil.getNow(),
                                    DateUtil.STR_YEARMONTHDAY) + "/" +fi.getName());
                            if (fCopy) {
                                FileUtil.deleteNcFile(loFilePath);
                            } else {
                                FileUtil.copyNcFile(loFilePath,newFilePathC + "/" + DateUtil.format(DateUtil.getNow(),
                                        DateUtil.STR_YEARMONTHDAY) + "/" +fi.getName());
                                FileUtil.deleteNcFile(loFilePath);
                            }
                            try {
                                objectName.setTypes("Info");
                                objectName.setResult("成功");
                                SyslogClient.sendClient(logIp,Integer.valueOf(logPort),objectName.toString());
                            }catch (Exception e) {
                                return;
                            }
                        } else {
                            try {
                                objectName.setResult("失败");
                                objectName.setTypes("error");
                                SyslogClient.sendClient(logIp,Integer.valueOf(logPort),objectName.toString());
                            }catch (Exception e) {
                                return;
                            }
                        }
                    }
                }

            } catch (Throwable throwable) {
                throwable.printStackTrace();
            }
        }
    }

    /**
     * å®šæ—¶ä»»åŠ¡æ‰§è¡Œå™¨å‚æ•°  æ¯å¤©å‡Œæ™¨1.30执行
     */
    @Override
    @Scheduled(cron = "0 30 1 * * ?")
    public void deleteNcSendFile() {
        Integer day;
        //取字典时间
        List<SingleDictionary> singleDictionaries=iSingleDictionaryService.findListFromTypeCode("DEL_TIME_SEND");
        if (singleDictionaries.size()!=1){
            return;
        }else {
            day= singleDictionaries.get(0).getDicValue();
        }
        Path ncDirectory = Paths.get("D:\\NC");
        //天转秒
        long dayToSecond = day * 24 * 60 * 60;
        if (Files.exists(ncDirectory) && Files.isDirectory(ncDirectory)) {
            // é€’归查找NC目录下所有名为send的文件夹
            try (Stream<Path> sendFolders = Files.walk(ncDirectory)
                    .filter(Files::isDirectory)
                    .filter(path -> path.getFileName().toString().equalsIgnoreCase("send"))) {
                sendFolders.forEach(sendFolder -> {
                    try {
                        // èŽ·å–当前时间
                        Instant now = Instant.now();
                        // éåŽ†SEND文件夹内的所有文件
                        Files.walk(sendFolder)
                                .filter(Files::isRegularFile)
                                .forEach(file -> {
                                    try {
                                        // èŽ·å–文件的最后修改时间
                                        Instant lastModified = Files.getLastModifiedTime(file).toInstant();
                                        // è®¡ç®—时间差
                                        Duration duration = Duration.between(lastModified, now);
                                        // åˆ¤æ–­æ˜¯å¦è¶…时（时间存在字典中，base_single_dictionary）
                                        if (duration.getSeconds() > dayToSecond) {
                                            try {
                                                Files.delete(file);
                                                System.out.println("已删除文件: " + file);
                                            } catch (IOException e) {
                                                System.err.println("删除文件 " + file + " æ—¶å‡ºçŽ°é”™è¯¯: " + e.getMessage());
                                            }
                                        }
                                    } catch (IOException e) {
                                        System.err.println("获取文件 " + file + " çš„最后修改时间时出现错误: " + e.getMessage());
                                    }
                                });
                    } catch (IOException e) {
                        System.err.println("遍历 " + sendFolder + " æ–‡ä»¶å¤¹æ—¶å‡ºçŽ°é”™è¯¯: " + e.getMessage());
                    }
                });
            } catch (IOException e) {
                System.err.println("查找send文件夹时出现错误: " + e.getMessage());
            }
        } else {
            System.err.println("D盘的NC目录不存在或不是有效的目录");
        }
    }
//    @Override
//    @Scheduled(cron = "${fileCron}")
//    public void fileClientTxtOrNc() {
//        SysLogMessageDto message = new SysLogMessageDto();
//        String host = "127.0.0.1";
//        if (StringUtils.isNotBlank(serverIp)) {
//            host = serverIp;
//        }
//        String port = "8299";
//        if (StringUtils.isNotBlank(serverPort)) {
//            port = serverPort;
//        }
//        String username = "admin";
//        if (StringUtils.isNotBlank(usernameService)) {
//            username = usernameService;
//        }
//        String pwd = "123";
//        if (StringUtils.isNotBlank(pwdService)) {
//            pwd = pwdService;
//        }
//        //文件本地地址，根据地址找到文件，将文件解析成文件流
//        String localFilePath = "E:\\test\\a\\";
//        if (StringUtils.isNotBlank(localFilePathC)) {
//            localFilePath = localFilePathC;
//        }
//        //文件上传目的地址，将文件上传到该地址
//        String servicePath = "E:\\test\\b\\";
//        if (StringUtils.isNotBlank(servicePathS)) {
//            servicePath = servicePathS;
//        }
//        boolean btelnetPort =  TelnetUtil.telnetPort(serverIp,Integer.valueOf(serverPort),10);
//        if (!btelnetPort) {
//            System.out.println("服务器连接： " + serverIp + ":" + serverPort + " å¼‚常！" );
//            return;
//        }
//        //第一步，获取token
//        String token = null;
//        try {
//            token = FileClient.getToken(host,port,username,pwd,addressToken);
//        } catch (Throwable throwable) {
//            throwable.printStackTrace();
//        }
//
//        //若获取token成功，再进行上传文件接口调用
//        if (token !=null && !token.equals("")){
//            try {
//                File f3 = new File(localFilePath);
//                File[] files = f3.listFiles();
//                for (File fi : files){
//                    if (fi.isFile()){
//                        SysLogTypeObjectDto objectName = new SysLogTypeObjectDto();
//                        objectName.setDateTime(DateUtil.format(DateUtil.getNow(),DateUtil.STR_DATE_TIME_SMALL));
//                        objectName.setFileName(fi.getName());
//                        objectName.setFileSize(FileUtil.changeFileFormatKb(String.valueOf(new File(localFilePath).length())));
//                        objectName.setSourceAddress(localFilePath);
//                        objectName.setDestination(serverIp);//服务端IP
//                        //顺序号
//                        DncPassLog passLog = getById("num0001");
//                        if (passLog == null) {
//                            passLog = new DncPassLog();
//                            passLog.setId("num0001");
//                            passLog.setSequenceNumber(1);
//                            objectName.setFileNum(Integer.toString(1));
//                            save(passLog);
//                        } else {
//                            Integer number = passLog.getSequenceNumber()+1;
//                            removeById("num0001");
//                            objectName.setFileNum(Integer.toString(number));
//
//                            passLog = new DncPassLog();
//                            passLog.setId("num0001");
//                            passLog.setSequenceNumber(number);
//                            save(passLog);
//                        }
//
//                        InetAddress address = null;
//                        try {
//                            address = InetAddress.getLocalHost();
//                            String ip = address.getHostAddress();
//                            objectName.setSourceAddress("20.10.17.11");//客户端IP
//                            objectName.setAddress(ip);
//                        } catch (UnknownHostException e) {
//                            objectName.setSourceAddress("127.0.0.1");
//                            objectName.setAddress("127.0.0.1");
//                        }
//                        objectName.setDestination(host);
//                        objectName.setResult("失败");
//                        //获取某个文件下的所有文件
//                        String loFilePath = localFilePath + fi.getName();
//                        String servicePathName =servicePath+"//" + fi.getName();
//                        File file = new File(loFilePath);
//                        if (file == null || !file.exists()){
//                            objectName.setAbstract1("sm3");
//                        } else {
//                            String sm3 = SmUtil.sm3(file);
//                            objectName.setAbstract1(sm3);
//                        }
//
//                        String b  = FileClient.uploadFile(host,port,token,fi.getName(),servicePathName,loFilePath,addressUploadFile);
//                        //文件备份删除
//                        if (b == null) {
//                            try {
//                                objectName.setResult("失败");
//                                objectName.setTypes("error");
//                                SyslogClient.sendClient(logIp,Integer.valueOf(logPort),objectName.toString());
//                            }catch (Exception e) {
//                                return;
//                            }
//                        }
//                        else if ( b.equals("成功")) {
//                            //备份数据
//                            boolean fCopy = FileUtil.copyNcFile(loFilePath,newFilePathC + "/" + DateUtil.format(DateUtil.getNow(),
//                                    DateUtil.STR_YEARMONTHDAY) + "/" +fi.getName());
//                            if (fCopy) {
//                                FileUtil.deleteNcFile(loFilePath);
//                            } else {
//                                FileUtil.copyNcFile(loFilePath,newFilePathC + "/" + DateUtil.format(DateUtil.getNow(),
//                                        DateUtil.STR_YEARMONTHDAY) + "/" +fi.getName());
//                                FileUtil.deleteNcFile(loFilePath);
//                            }
//                            try {
//                                objectName.setTypes("Info");
//                                objectName.setResult("成功");
//                                SyslogClient.sendClient(logIp,Integer.valueOf(logPort),objectName.toString());
//                            }catch (Exception e) {
//                                return;
//                            }
//                        } else {
//                            try {
//                                objectName.setResult("失败");
//                                objectName.setTypes("error");
//                                SyslogClient.sendClient(logIp,Integer.valueOf(logPort),objectName.toString());
//                            }catch (Exception e) {
//                                return;
//                            }
//                        }
//                    }
//                }
//
//            } catch (Throwable throwable) {
//                throwable.printStackTrace();
//            }
//        }
//    }
//
//    /**
//     * å®šæ—¶ä»»åŠ¡æ‰§è¡Œå™¨å‚æ•°  æ¯å¤©å‡Œæ™¨1.30执行
//     */
//    @Override
//    @Scheduled(cron = "0 30 1 * * ?")
//    public void deleteNcSendFile() {
//        Integer day;
//        //取字典时间
//        List<SingleDictionary> singleDictionaries=iSingleDictionaryService.findListFromTypeCode("DEL_TIME_SEND");
//        if (singleDictionaries.size()!=1){
//            return;
//        }else {
//            day= singleDictionaries.get(0).getDicValue();
//        }
//        Path ncDirectory = Paths.get("D:\\NC");
//        //天转秒
//        long dayToSecond = day * 24 * 60 * 60;
//        if (Files.exists(ncDirectory) && Files.isDirectory(ncDirectory)) {
//            // é€’归查找NC目录下所有名为send的文件夹
//            try (Stream<Path> sendFolders = Files.walk(ncDirectory)
//                    .filter(Files::isDirectory)
//                    .filter(path -> path.getFileName().toString().equalsIgnoreCase("send"))) {
//                sendFolders.forEach(sendFolder -> {
//                    try {
//                        // èŽ·å–当前时间
//                        Instant now = Instant.now();
//                        // éåŽ†SEND文件夹内的所有文件
//                        Files.walk(sendFolder)
//                                .filter(Files::isRegularFile)
//                                .forEach(file -> {
//                                    try {
//                                        // èŽ·å–文件的最后修改时间
//                                        Instant lastModified = Files.getLastModifiedTime(file).toInstant();
//                                        // è®¡ç®—时间差
//                                        Duration duration = Duration.between(lastModified, now);
//                                        // åˆ¤æ–­æ˜¯å¦è¶…时（时间存在字典中，base_single_dictionary）
//                                        if (duration.getSeconds() > dayToSecond) {
//                                            try {
//                                                Files.delete(file);
//                                                System.out.println("已删除文件: " + file);
//                                            } catch (IOException e) {
//                                                System.err.println("删除文件 " + file + " æ—¶å‡ºçŽ°é”™è¯¯: " + e.getMessage());
//                                            }
//                                        }
//                                    } catch (IOException e) {
//                                        System.err.println("获取文件 " + file + " çš„最后修改时间时出现错误: " + e.getMessage());
//                                    }
//                                });
//                    } catch (IOException e) {
//                        System.err.println("遍历 " + sendFolder + " æ–‡ä»¶å¤¹æ—¶å‡ºçŽ°é”™è¯¯: " + e.getMessage());
//                    }
//                });
//            } catch (IOException e) {
//                System.err.println("查找send文件夹时出现错误: " + e.getMessage());
//            }
//        } else {
//            System.err.println("D盘的NC目录不存在或不是有效的目录");
//        }
//    }

}

 src/main/java/com/lxzn/base/service/impl/ReceiveFileServiceImpl.java

@@ -37,157 +37,157 @@
    @Value("${fileNCPath}")
    private String fileNCPath;

    @Override
    @Scheduled(cron = "${ncFileRec}")
    public void analysisAndCopyFileRec() {
        if (StringUtils.isBlank(filePath)) {
            return;
        }
        File f3 = new File(filePath);
        File[] files = f3.listFiles();
        for (File fi : files){
            InputStreamReader input =null;
            BufferedReader bufferedReader =null;
            String loFilePath = filePath + fi.getName();
            System.out.println(loFilePath);
            try {
                if (FileUtil.getFileSuffix(fi.getName()).equals("nc")) {
                    String line;
                    int count = 0;
                    NcTxtFilePathInfo result = new NcTxtFilePathInfo();
                    FileInputStream fis = null;
                    try {
                        fis = new FileInputStream(loFilePath);
                    } catch (Exception e1) {
                        e1.printStackTrace();
                    }
                    Scanner sc = new Scanner(fis, "UTF-8");
                    while (count < 8 &&  sc.hasNext()) {
                        line = sc.nextLine();
                        if (count ==0) {
                            result.setFileTxtName(line.trim());
                        } else  if (count ==1) {
                            result.setFileNcName(line.trim());
                        }else  if (count ==2) {
                            result.setOrigFileName(line.trim());
                        }else  if (count ==3) {
                            result.setOrigFileSuffix(line.trim());
                        }else  if (count ==4) {
                            result.setFilePath(line.trim());
                        }else  if (count ==5) {
                            result.setEquipmentId(line.trim());
                        }else  if (count ==6) {
                            result.setFileAddOrDelete(Integer.valueOf(line.trim()));
                        }else  if (count == 7) {
                            result.setFileSize(line.trim());
                        }
                        count++;
                    }
                    if (sc != null) {
                        sc.close();
                    }
                    if (bufferedReader != null) {
                        bufferedReader.close();
                    }
                    if (input != null) {
                        input.close();
                    }
                    if (result == null) {
                        continue;
                    }
                    if (result.getFileAddOrDelete() != null ) {
                        if ( result.getFileAddOrDelete()==1) {
                            String path = "";
                            SingleDictionary singleDictionary=dictionaryService.findListFromTypeCode("virtual_equipment_id").get(0);
                            String docEquipmentId = null;
                            if (singleDictionary != null) {
                                docEquipmentId= String.valueOf(singleDictionary.getDicValue());
                            }
                            if (result.getEquipmentId().equals(docEquipmentId)) {
                                //虚拟设备处理
                                path = filePath + result.getOrigFileName();
                                if (StringUtils.isNotBlank(result.getOrigFileName()) &&
                                        result.getOrigFileName().equals("null")) {
                                    //文件待处理
                                    //备份数据
                                    FileUtil.deleteFileNewRec(loFilePath);
                                    continue;
                                }
                            }else {
                                path = filePath + result.getFileNcName()+ ".NC";
                                if (StringUtils.isNotBlank(result.getFileNcName()) &&
                                        result.getFileNcName().equals("null")) {
                                    //文件待处理
                                    //备份数据
                                    FileUtil.deleteFileNewRec(loFilePath);
                                    continue;
                                }
                            }
                            File ncFile = new File(path);
                            if (ncFile == null) {
                                continue;
                            } else {
                                //已经存在文件需要备份
                                String size = String.valueOf(ncFile.length());
                                if (!size.equals(result.getFileSize())) {
                                    continue;
                                }

                                boolean bool = docInfoService.addDocInfoRecService(result.getEquipmentId(),
                                        ncFile,result.getOrigFileSuffix(),
                                        FileUtil.getFilenameNonSuffix(result.getOrigFileName())
                                        ,result.getFilePath());
                                if (bool) {
                                    FileUtil.deleteFileNewRec(path);
                                    FileUtil.deleteFileNewRec(loFilePath);
                                }
                            }
                        } else {
                            String path;
                            /*if(StringUtils.isBlank(result.getOrigFileSuffix())) {
                                path = fileNCPath + "/" + result.getFilePath() + "/send/" +result.getOrigFileName();
                            } else {
                                path = fileNCPath + "/" + result.getFilePath() + "/send/" +result.getOrigFileName()+ "." + result.getOrigFileSuffix();
                            }*/

                            /*File ncFile = new File(path);*/
                            /*if (ncFile == null) {
                                return;
                            } else {
                                //待优化
                                boolean deleteFile = FileUtil.copyFileNcToBak(result.getFilePath(),
                                        result.getOrigFileName(), result.getOrigFileSuffix());
                                FileUtil.deleteFile(path);
                                FileUtil.deleteFile(loFilePath);
                            }*/
                        }

                    }
                }
            } catch (Exception e1) {
                try {
                    if (bufferedReader != null) {
                        bufferedReader.close();
                    }
                    if (input != null) {
                        input.close();
                    }
                } catch (IOException e) {
                    e.printStackTrace();
                }
                e1.printStackTrace();
            } finally {
                try {
                    if (bufferedReader != null) {
                        bufferedReader.close();
                    }
                    if (input != null) {
                        input.close();
                    }
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
    }
//    @Override
//    @Scheduled(cron = "${ncFileRec}")
//    public void analysisAndCopyFileRec() {
//        if (StringUtils.isBlank(filePath)) {
//            return;
//        }
//        File f3 = new File(filePath);
//        File[] files = f3.listFiles();
//        for (File fi : files){
//            InputStreamReader input =null;
//            BufferedReader bufferedReader =null;
//            String loFilePath = filePath + fi.getName();
//            System.out.println(loFilePath);
//            try {
//                if (FileUtil.getFileSuffix(fi.getName()).equals("nc")) {
//                    String line;
//                    int count = 0;
//                    NcTxtFilePathInfo result = new NcTxtFilePathInfo();
//                    FileInputStream fis = null;
//                    try {
//                        fis = new FileInputStream(loFilePath);
//                    } catch (Exception e1) {
//                        e1.printStackTrace();
//                    }
//                    Scanner sc = new Scanner(fis, "UTF-8");
//                    while (count < 8 &&  sc.hasNext()) {
//                        line = sc.nextLine();
//                        if (count ==0) {
//                            result.setFileTxtName(line.trim());
//                        } else  if (count ==1) {
//                            result.setFileNcName(line.trim());
//                        }else  if (count ==2) {
//                            result.setOrigFileName(line.trim());
//                        }else  if (count ==3) {
//                            result.setOrigFileSuffix(line.trim());
//                        }else  if (count ==4) {
//                            result.setFilePath(line.trim());
//                        }else  if (count ==5) {
//                            result.setEquipmentId(line.trim());
//                        }else  if (count ==6) {
//                            result.setFileAddOrDelete(Integer.valueOf(line.trim()));
//                        }else  if (count == 7) {
//                            result.setFileSize(line.trim());
//                        }
//                        count++;
//                    }
//                    if (sc != null) {
//                        sc.close();
//                    }
//                    if (bufferedReader != null) {
//                        bufferedReader.close();
//                    }
//                    if (input != null) {
//                        input.close();
//                    }
//                    if (result == null) {
//                        continue;
//                    }
//                    if (result.getFileAddOrDelete() != null ) {
//                        if ( result.getFileAddOrDelete()==1) {
//                            String path = "";
//                            SingleDictionary singleDictionary=dictionaryService.findListFromTypeCode("virtual_equipment_id").get(0);
//                            String docEquipmentId = null;
//                            if (singleDictionary != null) {
//                                docEquipmentId= String.valueOf(singleDictionary.getDicValue());
//                            }
//                            if (result.getEquipmentId().equals(docEquipmentId)) {
//                                //虚拟设备处理
//                                path = filePath + result.getOrigFileName();
//                                if (StringUtils.isNotBlank(result.getOrigFileName()) &&
//                                        result.getOrigFileName().equals("null")) {
//                                    //文件待处理
//                                    //备份数据
//                                    FileUtil.deleteFileNewRec(loFilePath);
//                                    continue;
//                                }
//                            }else {
//                                path = filePath + result.getFileNcName()+ ".NC";
//                                if (StringUtils.isNotBlank(result.getFileNcName()) &&
//                                        result.getFileNcName().equals("null")) {
//                                    //文件待处理
//                                    //备份数据
//                                    FileUtil.deleteFileNewRec(loFilePath);
//                                    continue;
//                                }
//                            }
//                            File ncFile = new File(path);
//                            if (ncFile == null) {
//                                continue;
//                            } else {
//                                //已经存在文件需要备份
//                                String size = String.valueOf(ncFile.length());
//                                if (!size.equals(result.getFileSize())) {
//                                    continue;
//                                }
//
//                                boolean bool = docInfoService.addDocInfoRecService(result.getEquipmentId(),
//                                        ncFile,result.getOrigFileSuffix(),
//                                        FileUtil.getFilenameNonSuffix(result.getOrigFileName())
//                                        ,result.getFilePath());
//                                if (bool) {
//                                    FileUtil.deleteFileNewRec(path);
//                                    FileUtil.deleteFileNewRec(loFilePath);
//                                }
//                            }
//                        } else {
//                            String path;
//                            /*if(StringUtils.isBlank(result.getOrigFileSuffix())) {
//                                path = fileNCPath + "/" + result.getFilePath() + "/send/" +result.getOrigFileName();
//                            } else {
//                                path = fileNCPath + "/" + result.getFilePath() + "/send/" +result.getOrigFileName()+ "." + result.getOrigFileSuffix();
//                            }*/
//
//                            /*File ncFile = new File(path);*/
//                            /*if (ncFile == null) {
//                                return;
//                            } else {
//                                //待优化
//                                boolean deleteFile = FileUtil.copyFileNcToBak(result.getFilePath(),
//                                        result.getOrigFileName(), result.getOrigFileSuffix());
//                                FileUtil.deleteFile(path);
//                                FileUtil.deleteFile(loFilePath);
//                            }*/
//                        }
//
//                    }
//                }
//            } catch (Exception e1) {
//                try {
//                    if (bufferedReader != null) {
//                        bufferedReader.close();
//                    }
//                    if (input != null) {
//                        input.close();
//                    }
//                } catch (IOException e) {
//                    e.printStackTrace();
//                }
//                e1.printStackTrace();
//            } finally {
//                try {
//                    if (bufferedReader != null) {
//                        bufferedReader.close();
//                    }
//                    if (input != null) {
//                        input.close();
//                    }
//                } catch (IOException e) {
//                    e.printStackTrace();
//                }
//            }
//        }
//    }
}

 src/main/java/com/lxzn/config/WebServiceConfig.java

@@ -1,62 +1,62 @@
package com.lxzn.config;

import com.lxzn.webservice.DncWebService;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBus;
import org.apache.cxf.jaxws.EndpointImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.xml.ws.Endpoint;

/**
 * @Description:
 * @Author: zhangherong
 * @Date: Created in 2020/12/24 17:09
 * @Version: 1.0
 * @Modified By:
 */
@Configuration
public class WebServiceConfig {

    @Autowired
    private DncWebService dncWebService;

    /**
     * Apache CXF æ ¸å¿ƒæž¶æž„是以BUS为核心，整合其他组件。
     * Bus是CXF的主干, ä¸ºå…±äº«èµ„源提供一个可配置的场所，作用类似于Spring的ApplicationContext，这些共享资源包括
     * WSDl管理器、绑定工厂等。通过对BUS进行扩展，可以方便地容纳自己的资源，或者替换现有的资源。默认Bus实现基于Spring架构，
     * é€šè¿‡ä¾èµ–注入，在运行时将组件串联起来。BusFactory负责Bus的创建。默认的BusFactory是SpringBusFactory，对应于默认
     * çš„Bus实现。在构造过程中，SpringBusFactory会搜索META-INF/cxf（包含在 CXF çš„jar中）下的所有bean配置文件。
     * æ ¹æ®è¿™äº›é…ç½®æ–‡ä»¶æž„建一个ApplicationContext。开发者也可以提供自己的配置文件来定制Bus。
     */
    @Bean(name = Bus.DEFAULT_BUS_ID)
    public SpringBus springBus() {
        return new SpringBus();
    }

    /**
     * æ­¤æ–¹æ³•ä½œç”¨æ˜¯æ”¹å˜é¡¹ç›®ä¸­æœåŠ¡åçš„前缀名，此处127.0.0.1或者localhost不能访问时，请使用ipconfig查看本机ip来访问
     * æ­¤æ–¹æ³•è¢«æ³¨é‡ŠåŽ, å³ä¸æ”¹å˜å‰ç¼€å(默认是services), wsdl访问地址为 http://127.0.0.1:8080/services/ws/api?wsdl
     * åŽ»æŽ‰æ³¨é‡ŠåŽwsdl访问地址为：http://127.0.0.1:8080/soap/ws/api?wsdl
     * http://127.0.0.1:8080/soap/列出服务列表 æˆ– http://127.0.0.1:8080/soap/ws/api?wsdl æŸ¥çœ‹å®žé™…的服务
     * æ–°å»ºServlet记得需要在启动类添加注解：@ServletComponentScan
     *
     * å¦‚果启动时出现错误：not loaded because DispatcherServlet Registration found non dispatcher servlet dispatcherServlet
     * å¯èƒ½æ˜¯springboot与cfx版本不兼容。
     * åŒæ—¶åœ¨spring boot2.0.6之后的版本与xcf集成，不需要在定义以下方法，直接在application.properties配置文件中添加：
     * cxf.path=/service（默认是services）
     */
    //@Bean
    //public ServletRegistrationBean dispatcherServlet() {
    //    return new ServletRegistrationBean(new CXFServlet(), "/soap/*");
    //}

    @Bean
    public Endpoint endpoint() {
        EndpointImpl endpoint = new EndpointImpl(springBus(), dncWebService);
        endpoint.publish("/ws/dnc");
        return endpoint;
    }
}
//package com.lxzn.config;
//
//import com.lxzn.webservice.DncWebService;
//import org.apache.cxf.Bus;
//import org.apache.cxf.bus.spring.SpringBus;
//import org.apache.cxf.jaxws.EndpointImpl;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//
//import javax.xml.ws.Endpoint;
//
///**
// * @Description:
// * @Author: zhangherong
// * @Date: Created in 2020/12/24 17:09
// * @Version: 1.0
// * @Modified By:
// */
//@Configuration
//public class WebServiceConfig {
//
//    @Autowired
//    private DncWebService dncWebService;
//
//    /**
//     * Apache CXF æ ¸å¿ƒæž¶æž„是以BUS为核心，整合其他组件。
//     * Bus是CXF的主干, ä¸ºå…±äº«èµ„源提供一个可配置的场所，作用类似于Spring的ApplicationContext，这些共享资源包括
//     * WSDl管理器、绑定工厂等。通过对BUS进行扩展，可以方便地容纳自己的资源，或者替换现有的资源。默认Bus实现基于Spring架构，
//     * é€šè¿‡ä¾èµ–注入，在运行时将组件串联起来。BusFactory负责Bus的创建。默认的BusFactory是SpringBusFactory，对应于默认
//     * çš„Bus实现。在构造过程中，SpringBusFactory会搜索META-INF/cxf（包含在 CXF çš„jar中）下的所有bean配置文件。
//     * æ ¹æ®è¿™äº›é…ç½®æ–‡ä»¶æž„建一个ApplicationContext。开发者也可以提供自己的配置文件来定制Bus。
//     */
//    @Bean(name = Bus.DEFAULT_BUS_ID)
//    public SpringBus springBus() {
//        return new SpringBus();
//    }
//
//    /**
//     * æ­¤æ–¹æ³•ä½œç”¨æ˜¯æ”¹å˜é¡¹ç›®ä¸­æœåŠ¡åçš„前缀名，此处127.0.0.1或者localhost不能访问时，请使用ipconfig查看本机ip来访问
//     * æ­¤æ–¹æ³•è¢«æ³¨é‡ŠåŽ, å³ä¸æ”¹å˜å‰ç¼€å(默认是services), wsdl访问地址为 http://127.0.0.1:8080/services/ws/api?wsdl
//     * åŽ»æŽ‰æ³¨é‡ŠåŽwsdl访问地址为：http://127.0.0.1:8080/soap/ws/api?wsdl
//     * http://127.0.0.1:8080/soap/列出服务列表 æˆ– http://127.0.0.1:8080/soap/ws/api?wsdl æŸ¥çœ‹å®žé™…的服务
//     * æ–°å»ºServlet记得需要在启动类添加注解：@ServletComponentScan
//     *
//     * å¦‚果启动时出现错误：not loaded because DispatcherServlet Registration found non dispatcher servlet dispatcherServlet
//     * å¯èƒ½æ˜¯springboot与cfx版本不兼容。
//     * åŒæ—¶åœ¨spring boot2.0.6之后的版本与xcf集成，不需要在定义以下方法，直接在application.properties配置文件中添加：
//     * cxf.path=/service（默认是services）
//     */
//    //@Bean
//    //public ServletRegistrationBean dispatcherServlet() {
//    //    return new ServletRegistrationBean(new CXFServlet(), "/soap/*");
//    //}
//
//    @Bean
//    public Endpoint endpoint() {
//        EndpointImpl endpoint = new EndpointImpl(springBus(), dncWebService);
//        endpoint.publish("/ws/dnc");
//        return endpoint;
//    }
//}

 src/main/java/com/lxzn/framework/domain/webservice/PlmProgramSourceInfo.java

@@ -14,7 +14,7 @@
 */
@Data
@NoArgsConstructor
@TableName(value = "PLM_PROGRAM_SOURCE")
@TableName(value = "plm_program_source")
public class PlmProgramSourceInfo implements Serializable {
    @TableId(value = "id")
    private String id;

 src/main/java/com/lxzn/framework/domain/webservice/request/ThirdDeProgramSource.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,89 @@
package com.lxzn.framework.domain.webservice.request;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import org.apache.commons.io.FilenameUtils;

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

/**
 * é›†æˆ3DE
 * @author clown
 * * @date 2022/9/19
 */
@Data
public class ThirdDeProgramSource implements Serializable {
    @TableId(value = "id")
    private String id;
    /*零件名称*/
    @TableField(value = "part_name")
    private String partName;
    /*零件图号*/
    @TableField(value = "part_no")
    private String partNo;
    /*版本号(工艺规程版本号)*/
    @TableField(value = "revision_no")
    private String revisionNo;
    /*车间名称*/
    @TableField(value = "nc_plant_name")
    private String ncPlantName;
    /*车间编号*/
    @TableField(value = "nc_plant_no")
    private String ncPlantNo;
    /*工序编号*/
    @TableField(value = "skgx_id")
    private String skgxId;
    /*工序名称*/
    @TableField(value = "skgx_name")
    private String skgxName;
    /*机床型号 nc_jcid*/
    @TableField(value = "nc_jcid")
    private String ncJcid;
    /*机床操作系统*/
    @TableField(value = "nc_os")
    private String ncOs;
    /*设备编号*/
    @TableField(value = "equipment_id")
    private String equipmentId;
    /*程序文件名（可能多个）*/
    @TableField(value = "nc_file_name")
    private String ncFileName;

    private transient Map<String,  byte[]> ncFiles;

    // ä¿®å¤æ–‡ä»¶å­—段定义
    private List<FileInfo> files;

    // æ·»åŠ æ–‡ä»¶ä¿¡æ¯ç±»
    @Data
    public static class FileInfo {
        private String file_name;
        // æ·»åŠ å…¶ä»–可能字段
        private String file_type;
        private Long file_size;
    }

    // æ·»åŠ æ–‡ä»¶è·¯å¾„和名称字段
    private String filePath;
    private String fileName;



    // æ·»åŠ è®¾ç½®NC文件的方法
    public void setNcFiles(Map<String, byte[]> ncFiles) {
        this.ncFiles = ncFiles;
        this.files = new ArrayList<>();

        for (Map.Entry<String, byte[]> entry : ncFiles.entrySet()) {
            FileInfo fileInfo = new FileInfo();
            fileInfo.setFile_name(entry.getKey());
            fileInfo.setFile_size((long) entry.getValue().length);
            fileInfo.setFile_type(FilenameUtils.getExtension(entry.getKey()));
            this.files.add(fileInfo);
        }
    }

}

 src/main/java/com/lxzn/nc/service/IDocRelativeService.java

@@ -47,4 +47,14 @@
     * @return
     */
    List<DeviceInfo> findDeviceByDocId(String docId);

    /**
     * æŸ¥è¯¢å…³è”关系
     * @param docId
     * @param classificationId
     * @param attributionType
     * @param attributionId
     * @return
     */
    DocRelative findDocRelative(String docId, String classificationId, Integer attributionType, String attributionId);
}

 src/main/java/com/lxzn/nc/service/impl/DocRelativeServiceImpl.java

@@ -157,4 +157,22 @@
            ExceptionCast.cast(CommonCode.INVALID_PARAM);
        return super.getBaseMapper().findDeviceByDocId(docId);
    }

    /**
     * æŸ¥è¯¢å…³è”关系
     * @param docId
     * @param classificationId
     * @param attributionType
     * @param attributionId
     * @return
     */
    @Override
    public DocRelative findDocRelative(String docId, String classificationId, Integer attributionType, String attributionId){
        LambdaQueryWrapper<DocRelative> lambdaQueryWrapper = Wrappers.lambdaQuery();
        lambdaQueryWrapper.eq(DocRelative::getDocId, docId);
        lambdaQueryWrapper.eq(DocRelative::getAttributionType, attributionType);
        lambdaQueryWrapper.eq(DocRelative::getAttributionId, attributionId);
        lambdaQueryWrapper.eq(DocRelative::getClassificationId, classificationId);
        return super.getOne(lambdaQueryWrapper);
    }
}

 src/main/java/com/lxzn/webservice/DncWebService.java

@@ -3,6 +3,7 @@
import com.lxzn.framework.domain.webservice.PlmProgramSourceInfo;
import com.lxzn.framework.domain.webservice.ProcedureFinish;
import com.lxzn.framework.domain.webservice.request.PlmProgramSource;
import com.lxzn.framework.domain.webservice.request.ThirdDeProgramSource;
import com.lxzn.webservice.ext.MesResultModel;

import javax.jws.WebMethod;
@@ -14,7 +15,7 @@
 * @CreateTime: 2025-02-27
 * @Description:
 */
@WebService(name = "DncWebService", targetNamespace = "http://lxzn.webservice.com")
//@WebService(name = "DncWebService", targetNamespace = "http://lxzn.webservice.com")
public interface DncWebService {

    /**
@@ -26,32 +27,20 @@
    @WebMethod
    MesResultModel syncPlmNcLogProgram(@WebParam(name = "msg") String msg);


    public MesResultModel setTree(PlmProgramSource plmProgramSource);
    /**
     * NC程序齐套接口（MES）-DNC系统接收到PLM传的NC程序，将程序包对应的零件号、工序号、设备编号传给MES系统
     * å®šæ—¶æ‰«æPlmProgramSourceInfo表中的数据，进行数据同步，每分钟同步一次
     * é›†æˆPLM挂树
     * @param plmProgramSource
     * @return
     */
    void syncWorkmanship();
    public MesResultModel setPlmTree(PlmProgramSource plmProgramSource);

    /**
     * æ´¾å·¥ä»»åŠ¡ä¸‹å‘接口(MES)
     *
     * @param msg
     * é›†æˆ3DE挂树
     * @param thirdDeProgramSource
     * @return
     */
    @WebMethod
    String issuedDispatchTask(@WebParam(name = "msg") String msg);
    public MesResultModel processThirdDEProgram(ThirdDeProgramSource thirdDeProgramSource);

    /**
     * å®Œå·¥æŽ¥å£(MES)
     *
     * @param msg
     * @return
     */
    @WebMethod
    String issuedProcedureFinish(@WebParam(name = "msg") String msg);

    String readFileName(String itemCode);
      String readFileName(String itemCode);
}

 src/main/java/com/lxzn/webservice/controller/DncWebController.java

@@ -1,11 +1,14 @@
package com.lxzn.webservice.controller;

import com.lxzn.framework.domain.webservice.request.ThirdDeProgramSource;
import com.lxzn.framework.domain.webservice.request.PlmProgramSource;
import com.lxzn.webservice.DncWebService;
import com.lxzn.webservice.ext.MesResultModel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -17,7 +20,6 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

@@ -29,16 +31,22 @@
    @Autowired
    private DncWebService dncWebService;

    @Value("${ncPdm.file_path}")
    @Value("${fileHomePath}")
    private String filePath;

    // å®šä¹‰å…³é”®æ–‡ä»¶ç±»åž‹
    private static final String INNER_ZIP_PREFIX = "【公开】NC程序文件 ";
    private static final String JSON_EXT = ".json";
    private static final String TXT_EXT = ".txt";

    /**
     * é›†æˆplm数据，压缩包（里面是NC压缩包与JSON文件）
     * @param file
     * @return
     */
    @PostMapping(value = "/syncPlmNcLogProgram", consumes = "multipart/form-data")
    @Transactional
    public String processNcPackage(MultipartFile file) {
        Path workDir = null;
        try {
            if (file == null || file.isEmpty()) {
                log.error("接收到的压缩文件为空");
@@ -47,7 +55,7 @@

            // åˆ›å»ºä¸´æ—¶ç›®å½•
            String timestamp = String.valueOf(System.currentTimeMillis());
            Path workDir = Paths.get(filePath, timestamp);
            workDir = Paths.get(filePath, "plm_" + timestamp);
            Files.createDirectories(workDir);

            // ä¿å­˜åŽŸå§‹æ–‡ä»¶
@@ -92,7 +100,6 @@
                for (Map.Entry<String, byte[]> entry : ncFiles.entrySet()) {
                    String fileName = entry.getKey();
                    if (allNcFiles.containsKey(fileName)) {
                        // ä¿®æ”¹ç‚¹5：记录重复警告（实际业务中可能需要更严格处理）
                        log.warn("检测到重复NC文件名: {}", fileName);
                    }
                    allNcFiles.put(fileName, entry.getValue());
@@ -108,19 +115,183 @@

            // ä¸šåŠ¡å¤„理
            return JSONObject.toJSONString(
                    dncWebService.setTree(plmPrograms)
                    dncWebService.setPlmTree(plmPrograms)
            );
        } catch (Exception e) {
            log.error("处理NC文件包失败", e);
            return MesResultModel.error("文件处理失败: " + e.getMessage());
        } finally {
            // æ¸…理临时文件
            if (workDir != null) {
                deleteDirectory(workDir.toFile());
            }
        }
    }

    /**
    * é›†æˆ3DE数据,压缩包（单个压缩包包含多个NC文件、一个工艺数据.TXT）
     * @param file ä¸Šä¼ çš„压缩包文件
     * @return å¤„理结果
     */
    @PostMapping(value = "/integration3DEData", consumes = "multipart/form-data")
    @Transactional
    public String integration3DEData(MultipartFile file) {
        Path workDir = null;
        try {
            if (file == null || file.isEmpty()) {
                log.error("接收到的3DE压缩文件为空");
                return MesResultModel.error("接收到的3DE压缩文件为空");
            }
            // åˆ›å»ºä¸´æ—¶å·¥ä½œç›®å½•
            String timestamp = String.valueOf(System.currentTimeMillis());
            workDir = Paths.get(filePath, "3de_" + timestamp);
            Files.createDirectories(workDir);
            // ä¿å­˜åŽŸå§‹æ–‡ä»¶
            Path originalPath = workDir.resolve(
                    Objects.requireNonNull(file.getOriginalFilename())
            );
            Files.copy(file.getInputStream(), originalPath, StandardCopyOption.REPLACE_EXISTING);
            log.info("3DE原始文件已保存: {} (大小: {} å­—节)",
                    originalPath, Files.size(originalPath));
            // è§£åŽ‹ZIP包获取所有文件
            Map<String, byte[]> packageContents = extractOuterZipContents(originalPath);
            log.info("3DE压缩包解析成功，包含 {} ä¸ªæ–‡ä»¶", packageContents.size());

            // æŸ¥æ‰¾å·¥è‰ºæ•°æ®TXT文件
            byte[] processData = findFileByExtension(packageContents, TXT_EXT);
            if (processData == null) {
                return MesResultModel.error("未找到工艺数据TXT文件");
            }

            // è§£æžå·¥è‰ºæ•°æ®TXT文件
            ThirdDeProgramSource thirdDeProgramSource = parseProcessTxtFile(processData);
            if (thirdDeProgramSource == null) {
                return MesResultModel.error("解析工艺数据TXT文件失败");
            }

            // æå–所有NC文件
            Map<String, byte[]> ncFiles = extractNcFiles(packageContents);
            if (ncFiles.isEmpty()) {
                return MesResultModel.error("未找到NC程序文件");
            }
            log.info("找到 {} ä¸ªNC程序文件", ncFiles.size());

            // è®¾ç½®NC文件集合和文件路径信息
            thirdDeProgramSource.setNcFiles(ncFiles);
            thirdDeProgramSource.setFilePath(workDir.toString());
            thirdDeProgramSource.setFileName(originalPath.getFileName().toString());

            // è°ƒç”¨æœåŠ¡å¤„理3DE数据
            return JSONObject.toJSONString(
                    dncWebService.processThirdDEProgram(thirdDeProgramSource)
            );
        } catch (Exception e) {
            log.error("处理3DE数据包失败", e);
            return MesResultModel.error("3DE文件处理失败: " + e.getMessage());
        } finally {
            // æ¸…理临时文件
            if (workDir != null) {
                deleteDirectory(workDir.toFile());
            }
        }
    }

    /**
     * è§£æžå·¥è‰ºæ•°æ®TXT文件
     * @param txtData TXT文件内容
     * @return ThirdDeProgramSource对象
     */
    private ThirdDeProgramSource parseProcessTxtFile(byte[] txtData) {
        try {
            String content = new String(txtData, StandardCharsets.UTF_8);
            log.info("工艺数据TXT内容:\n{}", content);

            // ä½¿ç”¨FastJSON解析JSON格式的TXT
            JSONObject json = JSONObject.parseObject(content);
            if (json == null) {
                log.error("解析工艺数据失败: ä¸æ˜¯æœ‰æ•ˆçš„JSON格式");
                return null;
            }

            // åˆ›å»ºå¯¹è±¡å¹¶è®¾ç½®å±žæ€§
            ThirdDeProgramSource programSource = new ThirdDeProgramSource();
            programSource.setPartName(json.getString("part_name"));
            programSource.setPartNo(json.getString("part_no"));
            programSource.setRevisionNo(json.getString("revision_no"));
            programSource.setSkgxId(json.getString("skgx_id"));
            programSource.setSkgxName(json.getString("skgx_name"));
            programSource.setNcJcid(json.getString("nc_jcid"));
            programSource.setNcOs(json.getString("nc_os"));
            programSource.setEquipmentId(json.getString("equipment_id"));
            programSource.setNcFileName(json.getString("nc_file_name"));
            programSource.setNcPlantNo(json.getString("nc_plant_no"));
            programSource.setNcPlantName(json.getString("nc_plant_name"));
            log.debug("解析的工艺数据: partName={}, partNo={}, revisionNo={}, skgxId={}, skgxName={}, " +
                            "ncJcid={}, ncOs={}, equipmentId={}, ncFileName={}, ncPlantNo={}, ncPlantName={}",
                    programSource.getPartName(), programSource.getPartNo(),
                    programSource.getRevisionNo(), programSource.getSkgxId(),
                    programSource.getSkgxName(), programSource.getNcJcid(),
                    programSource.getNcOs(), programSource.getEquipmentId(),
                    programSource.getNcFileName(), programSource.getNcPlantNo(),
                    programSource.getNcPlantName());

            return programSource;
        } catch (Exception e) {
            log.error("解析工艺数据TXT文件失败", e);
            return null;
        }
    }

    /**
     * è§£æžé”®å€¼å¯¹æ ¼å¼çš„TXT文件
     * @param content TXT文件内容
     * @return é”®å€¼å¯¹æ˜ å°„
     */
    private Map<String, String> parseKeyValueTxt(String content) {
        Map<String, String> result = new HashMap<>();
        String[] lines = content.split("\\r?\\n");

        for (String line : lines) {
            line = line.trim();
            if (line.isEmpty() || line.startsWith("#") || line.startsWith("//")) {
                continue; // è·³è¿‡ç©ºè¡Œå’Œæ³¨é‡Š
            }

            int separatorIndex = line.indexOf('=');
            if (separatorIndex > 0) {
                String key = line.substring(0, separatorIndex).trim();
                String value = line.substring(separatorIndex + 1).trim();
                result.put(key, value);
            }
        }

        return result;
    }

    /**
     * ä»Žæ–‡ä»¶å†…容中提取NC文件
     * @param packageContents åŒ…内容映射
     * @return NC文件映射
     */
    private Map<String, byte[]> extractNcFiles(Map<String, byte[]> packageContents) {
        Map<String, byte[]> ncFiles = new HashMap<>();

        for (Map.Entry<String, byte[]> entry : packageContents.entrySet()) {
            String fileName = entry.getKey();
            String fileExt = FilenameUtils.getExtension(fileName).toLowerCase();
            if (fileExt.equals("nc")) {
                ncFiles.put(fileName, entry.getValue());
                log.debug("找到NC文件: {}", fileName);
            }
        }

        return ncFiles;
    }

    // ä¼˜åŒ–后的解压方法（使用commons-compress）
    private Map<String, byte[]> extractOuterZipContents(Path filePath) throws IOException {
        Map<String, byte[]> contents = new HashMap<>();
        log.info("开始解析ZIP文件: {}", filePath);

        try {
            try (ZipFile zipFile = new ZipFile(filePath.toFile())) {
                log.info("ZIP文件格式检测: {}", zipFile.getEncoding());
@@ -131,17 +302,9 @@
                    if (entry.isDirectory()) continue;

                    try (InputStream is = zipFile.getInputStream(entry)) {
                        ByteArrayOutputStream baos = new ByteArrayOutputStream();
                        byte[] buffer = new byte[8192];
                        int len;
                        while ((len = is.read(buffer)) > 0) {
                            baos.write(buffer, 0, len);
                        }

                        // ä¿ç•™åŽŸå§‹æ–‡ä»¶å
                        String name = entry.getName();
                        contents.put(name, baos.toByteArray());
                        log.debug("提取文件: {} ({} å­—节)", name, baos.size());
                        byte[] data = IOUtils.toByteArray(is);
                        contents.put(entry.getName(), data);
                        log.debug("提取文件: {} ({} å­—节)", entry.getName(), data.length);
                    }
                }
            }
@@ -175,14 +338,15 @@

    private List<byte[]> findAllFilesByExtension(Map<String, byte[]> contents, String extension) {
        String extLower = extension.toLowerCase();
        return contents.entrySet().stream()
                .filter(e -> {
                    String fileName = e.getKey();
                    // ä½¿ç”¨å°å†™æ¯”较避免大小写敏感问题
                    return fileName.toLowerCase().endsWith(extLower);
                })
                .map(Map.Entry::getValue)
                .collect(Collectors.toList());
        List<byte[]> result = new ArrayList<>();

        for (Map.Entry<String, byte[]> entry : contents.entrySet()) {
            String fileName = entry.getKey().toLowerCase();
            if (fileName.endsWith(extLower)) {
                result.add(entry.getValue());
            }
        }
        return result;
    }

    // å†…部ZIP解析方法
@@ -213,57 +377,25 @@
     * æ ¹æ®æ‰©å±•åæŸ¥æ‰¾æ–‡ä»¶
     */
    private byte[] findFileByExtension(Map<String, byte[]> contents, String extension) {
        return contents.entrySet().stream()
                .filter(e -> e.getKey().toLowerCase().endsWith(extension))
                .map(Map.Entry::getValue)
                .findFirst()
                .orElse(null);
        String extLower = extension.toLowerCase();
        for (Map.Entry<String, byte[]> entry : contents.entrySet()) {
            if (entry.getKey().toLowerCase().endsWith(extLower)) {
                return entry.getValue();
            }
        }
        return null;
    }

    /**
     * èŽ·å–文件名（根据扩展名）
     */
    private String getFileNameByExtension(Map<String, byte[]> contents) {
        return contents.keySet().stream()
                .filter(k -> k.toLowerCase().endsWith(DncWebController.JSON_EXT))
                .findFirst()
                .orElse("Unknown");
    }

    /**
     * æŸ¥æ‰¾ä¸ŽæŒ‡å®šå‰ç¼€åŒ¹é…çš„文件内容
    * @param contents æ–‡ä»¶å†…容映射（文件名 -> æ–‡ä»¶å†…容）
    * @param prefix è¦åŒ¹é…çš„文件名前缀
    * @return åŒ¹é…çš„第一个文件内容，未找到返回 null
    */
    private byte[] findFileByPrefix(Map<String, byte[]> contents, String prefix) {
        if (prefix == null || prefix.isEmpty()) {
            log.warn("文件前缀不能为空");
            return null;
        for (String key : contents.keySet()) {
            if (key.toLowerCase().endsWith(JSON_EXT)) {
                return key;
            }
        }

        return contents.entrySet().stream()
                .filter(entry -> {
                    String fileName = entry.getKey();

                    // è·¯å¾„规范化处理
                    String normalizedKey = fileName.replace('\\', '/');

                    // èŽ·å–纯文件名
                    int lastSlash = normalizedKey.lastIndexOf('/');
                    String pureFileName = (lastSlash >= 0) ?
                            normalizedKey.substring(lastSlash + 1) :
                            normalizedKey;

                    // è°ƒè¯•æ—¥å¿—
                    log.debug("检查文件: [原始: {}], [纯文件名: {}], å‰ç¼€: {}",
                            fileName, pureFileName, prefix);

                    return pureFileName.contains("NC");
                })
                .map(Map.Entry::getValue)
                .findFirst()
                .orElse(null);
        return "Unknown";
    }

    /**
@@ -274,4 +406,26 @@
        return JSONObject.parseObject(json, PlmProgramSource.class);
    }

    /**
     * é€’归删除目录
     */
    private void deleteDirectory(File directory) {
        if (!directory.exists()) return;

        File[] files = directory.listFiles();
        if (files != null) {
            for (File file : files) {
                if (file.isDirectory()) {
                    deleteDirectory(file);
                } else {
                    if (!file.delete()) {
                        log.warn("无法删除文件: {}", file.getAbsolutePath());
                    }
                }
            }
        }
        if (!directory.delete()) {
            log.warn("无法删除目录: {}", directory.getAbsolutePath());
        }
    }
}

 src/main/java/com/lxzn/webservice/impl/DncWebServiceImpl.java

@@ -8,14 +8,14 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.lxzn.activiti.service.IAssignFileStreamService;
import com.lxzn.framework.domain.activiti.response.ActivitiCode;
import com.lxzn.framework.domain.filesystem.response.FileUploadResult;
import com.lxzn.framework.domain.nc.*;
import com.lxzn.framework.domain.nc.response.DocumentCode;
import com.lxzn.framework.domain.webservice.DispatchInfo;
import com.lxzn.framework.domain.webservice.PlmProgramSourceInfo;
import com.lxzn.framework.domain.webservice.ProcedureFinish;
import com.lxzn.framework.domain.webservice.request.NcProgramInfo;
import com.lxzn.framework.domain.webservice.request.PlmProgramSource;
import com.lxzn.framework.domain.webservice.request.*;
import com.lxzn.framework.exception.ExceptionCast;
import com.lxzn.framework.model.response.CommonCode;
import com.lxzn.framework.utils.CxfClientUtil;
@@ -24,9 +24,8 @@
import com.lxzn.framework.utils.ZipUtil;
import com.lxzn.framework.utils.file.FileUtil;
import com.lxzn.nc.service.*;
import com.lxzn.nc.service.impl.DeviceInfoServiceImpl;
import com.lxzn.webservice.DncWebService;
import com.lxzn.framework.domain.webservice.request.WsDispatch;
import com.lxzn.framework.domain.webservice.request.WsProcedureFinish;
import com.lxzn.webservice.ext.MesResultModel;
import com.lxzn.webservice.service.IDispatchInfoService;
import com.lxzn.webservice.service.IPlmProgramSourceInfoService;
@@ -62,40 +61,12 @@
 * @Description:
 */
@Service
@WebService(name = "DncWebService",
        targetNamespace = "http://lxzn.webservice.com",
        endpointInterface = "com.lxzn.webservice.DncWebService"
)
//@WebService(name = "DncWebService",
//        targetNamespace = "http://lxzn.webservice.com",
//        endpointInterface = "com.lxzn.webservice.DncWebService"
//)
@Slf4j
public class DncWebServiceImpl implements DncWebService {

    @Value("${ncPdm.file_path}")
    private String filePath;
    /**
     * url
     */
    @Value("${webservice.url}")
    private String url;

    /**
     * namespace
     */
    @Value("${webservice.namespace}")
    private String namespace;

    /**
     * method
     */
    @Value("${webservice.method}")
    private String method;
    @Resource
    private IDispatchInfoService dispatchInfoService;
    @Resource
    private IProcedureFinishService procedureFinishService;
    @Resource
    private IDeviceInfoService deviceInfoService;
    @Resource
    private IAssignFileStreamService assignFileStreamService;
    @Resource
    private IPlmProgramSourceInfoService iPlmProgramSourceInfoService;
    @Autowired
@@ -126,112 +97,10 @@
    private IDocClassificationService docClassificationService;
    @Autowired
    private IDeviceManagementService deviceManagementService;

    /**
     * æ´¾å·¥ä»»åŠ¡ä¸‹å‘接口
     * @param msg
     * @return
     */
    @Override
    public String issuedDispatchTask(@WebParam(name = "msg") String msg){
        log.info("MES派工任务下发原始数据 === {}", msg);
        List<WsDispatch> wsDispatchList = JSONObject.parseArray(msg, WsDispatch.class);
        for (WsDispatch wsDispatch : wsDispatchList) {
            DispatchInfo dispatchInfo = new DispatchInfo();
            BeanUtils.copyProperties(wsDispatch, dispatchInfo);
            dispatchInfoService.save(dispatchInfo);
            Map<Boolean,String> ncResult = disPatchTaskNc(dispatchInfo);
            if (ncResult.containsKey(false)) {
                // è¿”回具体的错误信息
                return MesResultModel.error("NC任务下发失败: " + ncResult.get(false));
            }
        }
        return MesResultModel.success("成功");
    }


    /**
     * ä¸‹å‘程序
     */
    public Map<Boolean,String> disPatchTaskNc(DispatchInfo dispatchInfo) {
        String processCode = dispatchInfo.getOperationSeqNo() + "_" + dispatchInfo.getEquipmentId();
        return assignFileStreamService.disPatchTaskNc(dispatchInfo.getEquipmentId(),
                dispatchInfo.getWorkshop(),dispatchInfo.getMdsItemCode(),processCode,dispatchInfo.getRevisionNo(),dispatchInfo.getId());
    }

    /**
     * å®Œå·¥
     *
     * @param msg
     * @return
     */
    @Override
    public String issuedProcedureFinish(String msg) {
        log.info("MES完工原始数据 === {}", msg);
        List<WsProcedureFinish> wsProcedureFinishList = JSONObject.parseArray(msg, WsProcedureFinish.class);
        if (CollectionUtils.isEmpty(wsProcedureFinishList)) {
            return MesResultModel.error("MesResultModel");
        }
        List<ProcedureFinish> procedureFinishList = wsProcedureFinishList.stream()
                .map(source -> {
                    ProcedureFinish target = new ProcedureFinish();
                    BeanUtils.copyProperties(source, target);
                    return target;
                })
                .collect(Collectors.toList());

        procedureFinishService.saveBatch(procedureFinishList);
        //DNC系统依据工单号删除设备结构树上对应的NC程序及工控网NC程序
        for (ProcedureFinish procedureFinish : procedureFinishList) {
            //DNC系统依据工单号删除设备结构树上对应的NC程序及工控网NC程序
            if (procedureFinish.getEndineStatus().equals("3")){
                //删除设备结构树上对应的NC程序及工控网NC程序
                ProductInfo productInfo = productInfoService.getByProductNo("PLM");
                if (productInfo == null) {
                    log.error("======= äº§å“å±‚级异常,请联系开发人员=======");
                    return MesResultModel.error("产品层级异常,请联系开发人员");
                }
                List<ComponentInfo> componentInfoList = componentInfoService.getByProductId(productInfo.getProductId());
                List<String

                        > comlist = new ArrayList<>();
                if (componentInfoList != null && !componentInfoList.isEmpty()) {
                    for (ComponentInfo cc : componentInfoList) {
                        comlist.add(cc.getComponentId());
                    }
                } else {
                    return MesResultModel.error("无部件信息,请联系开发人员");
                }
                String processCode=procedureFinish.getMdsItemCode();
                PartsInfo part = partsInfoService.getByCodeAndComIdList(procedureFinish.getMdsItemCode(),comlist);
                if (part == null) {
                    return MesResultModel.error("无此零件信息"+"__" + processCode+",请联系开发人员");
                }
                processCode = processCode.split("_")[0];
                //工序
                ProcessStream stream = processStreamService.findByProcessEquipment(procedureFinish.getEquipmentId(),
                        processCode,procedureFinish.getRevisionNo(),productInfo.getProductId(),part.getPartsId());
                if (stream == null) {
                    return MesResultModel.error("无此工序信息"+"__" + processCode+",请联系开发人员");
                }
                //查询对应NC程序
                List<ProcessStream> processStreamList = new ArrayList<>();
                processStreamList.add(stream);
                List<DocInfo> docFileList = docInfoService.getByProcessIds(processStreamList);
                if (docFileList == null || docFileList.isEmpty()) {
                    return MesResultModel.error("无此NC程序" + "__" + processCode + ",请联系开发人员");
                }
                docFileList.forEach(docFile -> {
                    docInfoService.deleteDocInfo(docFile.getDocId());
                });
            }

        }
        log.info("接收MES完工原始数据成功！");
        return MesResultModel.success("成功");
    }


    @Autowired
    private DeviceInfoServiceImpl deviceInfoService;
    @Autowired
    private IDeviceGroupService deviceGroupService;
    /**
     * èŽ·å–NC文件及属性信息(集成PLM)
     *
@@ -246,7 +115,7 @@
        List<PlmProgramSource> plmProgramSourceList = JSONObject.parseArray(msg, PlmProgramSource.class);
        AtomicReference<MesResultModel> mesResultModel= new AtomicReference<>(new MesResultModel());
        plmProgramSourceList.forEach(item -> {
            mesResultModel.set(setTree(item));
            mesResultModel.set(setPlmTree(item));
        });
        return mesResultModel.get();
    }
@@ -262,7 +131,7 @@
     * @param plmProgramSource
     * @return
     */
    public MesResultModel setTree(PlmProgramSource plmProgramSource) {
    public MesResultModel setPlmTree(PlmProgramSource plmProgramSource) {
        MesResultModel model = new MesResultModel();
        model.setSuccFlag("成功");
        PlmProgramSourceInfo plmProgramSourceInfo = new PlmProgramSourceInfo();
@@ -485,76 +354,407 @@
        return model;
    }

    /**
     * å°è£…树结构
     * 1. äº§å“ é›†æˆæ•°æ®
     * 2、部件 æŒ‰ç…§éƒ¨é—¨ï¼ˆè½¦é—´ nc_plant_name ï¼‰ç»´åº¦å»ºç«‹
     * 3、零件 å›¾å·ï¼ˆé›¶ä»¶å·ã€é›¶ä»¶åç§°ï¼‰ part_no
     * 4、工序  å·¥è‰ºID（工艺规程编号/临规编号）
     * 5. nc文件 ï¼ˆå·¥åºä¸‹ï¼‰
     * 6.机床型号与机床操作系统组成设备类与工序进行绑定
     * é›†æˆ3DE挂树
     * @param thirdDeProgramSource
     * @return
     */
    @Override
    @Transactional
    public MesResultModel processThirdDEProgram(ThirdDeProgramSource thirdDeProgramSource) {
        MesResultModel model = new MesResultModel();
        model.setSuccFlag("成功");

        try {
            log.info("3DE NC文件及属性信息原始数据 === {}", JSONObject.toJSONString(thirdDeProgramSource));

            // äº§å“ - ä½¿ç”¨é»˜è®¤çš„3DE产品
            ProductInfo productInfo = productInfoService.getByProductNo("3DE");
            if (productInfo == null) {
                return createErrorModel(model, "3DE产品层级异常,请联系开发人员");
            }

            // éƒ¨ä»¶ - æŒ‰ç…§è½¦é—´ç»´åº¦å»ºç«‹
            ComponentInfo componentInfo = componentInfoService.getByCode(thirdDeProgramSource.getNcPlantNo());
            if (componentInfo == null) {
                componentInfo = new ComponentInfo();
                componentInfo.setComponentId(IdWorker.getIdStr());
                componentInfo.setComponentCode(thirdDeProgramSource.getNcPlantNo());
                componentInfo.setComponentName(thirdDeProgramSource.getNcPlantName());
                componentInfo.setComponentStatus(1);
                componentInfo.setRankLevel(1);
                componentInfo.setParentId(productInfo.getProductId());
                componentInfo.setProductId(productInfo.getProductId());

                if (!componentInfoService.save(componentInfo)) {
                    return createErrorModel(model, "添加3DE部件层级失败,请联系开发人员");
                }
                if (!savePermissionList(componentInfo, productInfo.getProductId())) {
                    return createErrorModel(model, "添加3DE部件权限失败,请联系开发人员");
                }
            }

            // é›¶ä»¶ - å›¾å·ï¼ˆé›¶ä»¶å·ã€é›¶ä»¶åç§°ï¼‰
            PartsInfo partsInfo = partsInfoService.getByCode(thirdDeProgramSource.getPartNo());
            if (partsInfo == null) {
                partsInfo = new PartsInfo();
                partsInfo.setPartsId(IdWorker.getIdStr());
                partsInfo.setComponentId(componentInfo.getComponentId());
                partsInfo.setProductId(productInfo.getProductId());
                partsInfo.setPartsStatus(1);
                partsInfo.setPartsCode(thirdDeProgramSource.getPartNo());
                partsInfo.setPartsName(thirdDeProgramSource.getPartName());
                partsInfo.setPartsModel(thirdDeProgramSource.getPartNo());

                if (!partsInfoService.save(partsInfo)) {
                    return createErrorModel(model, "添加3DE零件层级失败,请联系开发人员");
                }
                // æ·»åŠ é›¶ä»¶æƒé™
                if (!savePartsPermission(partsInfo, productInfo.getProductId())) {
                    return createErrorModel(model, "添加3DE零件权限失败,请联系开发人员");
                }
            }

            // å·¥åº - å·¥è‰ºID（工艺规程编号/临规编号）
            ProcessStream processStream = processStreamService.findByProcessNoAndPartsId(
                    thirdDeProgramSource.getSkgxId(), partsInfo.getPartsId());
            List<ProcessStream> addProcessList = new ArrayList<>();
            List<ProcessStream> updateProcessList = new ArrayList<>();

            if (processStream == null) {
                processStream = new ProcessStream();
                processStream.setProcessId(IdWorker.getIdStr());
                processStream.setProductId(productInfo.getProductId());
                processStream.setComponentId(componentInfo.getComponentId());
                processStream.setPartsId(partsInfo.getPartsId());
                processStream.setProcessCode(thirdDeProgramSource.getSkgxId());
                processStream.setProcessName(thirdDeProgramSource.getSkgxName());
                processStream.setCraftVersion(thirdDeProgramSource.getRevisionNo()); // è®¾ç½®å·¥è‰ºç‰ˆæœ¬

                // è®¾å¤‡ä¿¡æ¯å¤„理
                DeviceManagement deviceManagement = deviceManagementService.findEquipmentIdsFromEqId(
                        thirdDeProgramSource.getNcPlantName(), thirdDeProgramSource.getEquipmentId());

                if (deviceManagement != null && StringUtils.isNotEmpty(deviceManagement.getEquipmentIds())) {
                    processStream.setProcessingEquipmentCode(deviceManagement.getEquipmentIds());
                } else {
                    processStream.setProcessingEquipmentCode(thirdDeProgramSource.getEquipmentId());
                }
                processStream.setProcessingEquipmentOs(thirdDeProgramSource.getNcOs());
                processStream.setProcessingEquipmentModel(thirdDeProgramSource.getNcJcid());
                addProcessList.add(processStream);
            } else {
                // æ›´æ–°æ—¶æ£€æŸ¥ç‰ˆæœ¬æ˜¯å¦å˜æ›´
                if (!Objects.equals(processStream.getCraftVersion(), thirdDeProgramSource.getRevisionNo())) {
                    processStream.setCraftVersion(thirdDeProgramSource.getRevisionNo());
                }
                processStream.setProcessName(thirdDeProgramSource.getSkgxName());
                updateProcessList.add(processStream);
            }

            if (!addProcessList.isEmpty() && !processStreamService.saveBatch(addProcessList)) {
                return createErrorModel(model, "添加3DE工序失败,请联系开发人员");
            }

            if (!updateProcessList.isEmpty() && !processStreamService.updateBatchById(updateProcessList)) {
                return createErrorModel(model, "更新3DE工序失败,请联系开发人员");
            }

            // æ–‡æ¡£åˆ†ç±»
            DocClassification ncDocClass = docClassificationService.getByCode("NC");
            if (ncDocClass == null) {
                return createErrorModel(model, "NC文档分类不存在,请联系开发人员");
            }

            // send文档分类
            DocClassification sendDocClass = docClassificationService.getByCode("SEND");
            if (sendDocClass == null) {
                return createErrorModel(model, "SEND文档分类不存在,请联系开发人员");
            }

            // å¤„理NC文件
            if (thirdDeProgramSource.getNcFiles() != null && !thirdDeProgramSource.getNcFiles().isEmpty()) {
                for (Map.Entry<String, byte[]> entry : thirdDeProgramSource.getNcFiles().entrySet()) {
                    String fileName = entry.getKey();
                    byte[] fileContent = entry.getValue();
                    String suffix = FileUtil.getFileSuffix(fileName);
                    String baseName = FileUtil.getFilenameNonSuffix(fileName);

                    // æŸ¥æ‰¾çŽ°æœ‰æ–‡æ¡£
                    DocInfo docInfo = docInfoService.findByAttrAndDocName(baseName, 5,
                            processStream.getProcessId(), suffix);

                    FileUploadResult fileUploadResult = FileUtil.uploadFileByFileNameAndFis(
                            fileName, new ByteArrayInputStream(fileContent));

                    if (fileUploadResult == null) {
                        return createErrorModel(model, "上传3DE NC文件失败");
                    }

                    boolean success;
                    if (docInfo == null) {
                        // æ–°å¢žæ–‡æ¡£
                        docInfo = new DocInfo();
                        String docId = IdWorker.getIdStr();
                        docInfo.setDocId(docId);
                        docInfo.setDocName(fileUploadResult.getFileName());
                        docInfo.setDocSuffix(fileUploadResult.getFileSuffix());
                        docInfo.setDocStatus(5);

                        // åˆ›å»ºæ–‡æ¡£å…³è”
                        DocRelative docRelative = new DocRelative();
                        docRelative.setAttributionId(processStream.getProcessId());
                        docRelative.setDocId(docInfo.getDocId());
                        docRelative.setAttributionType(5);
                        docRelative.setClassificationId(ncDocClass.getClassificationId());

                        if (!docRelativeService.save(docRelative)) {
                            return createErrorModel(model, "创建3DE文档关联失败");
                        }

                        // ä¿å­˜æ–‡æ¡£æ–‡ä»¶
                        if (getFile(docInfo, fileUploadResult, docFileService)) {
                            return createErrorModel(model, "保存3DE文档文件失败");
                        }

                        success = docInfoService.save(docInfo);

                        // èŽ·å–最新文档文件
                        DocFile docFile = docFileService.getDocFileNearest(docId);

                        // æ·»åŠ åˆ°è®¾å¤‡
                        if (!linkToDevice(thirdDeProgramSource.getEquipmentId(), docInfo.getDocId(), docFile, sendDocClass)) {
                            return createErrorModel(model, "添加设备文档关联失败");
                        }
                    } else {
                        // æ›´æ–°æ–‡æ¡£ - å¤„理版本控制
                        if (StringUtils.isNotEmpty(processStream.getCraftVersion()) &&
                                StringUtils.isNotEmpty(thirdDeProgramSource.getRevisionNo())) {
                            // ç‰ˆæœ¬å˜æ›´ï¼Œä¿å­˜æ—§ç‰ˆæœ¬æ–‡ä»¶
                            if (!Objects.equals(processStream.getCraftVersion(), thirdDeProgramSource.getRevisionNo())) {
                                this.createFileOldNcPathAndCopyFor3DE(docInfo, thirdDeProgramSource);
                            }
                        }

                        DocFile docFile = getDocFile(docInfo, fileUploadResult);
                        success = docFileService.addDocFile(docFile);

                        if (success) {
                            docInfo.setPublishVersion(docFile.getDocVersion());
                            docInfo.setPublishFileId(docFile.getFileId());
                            success = docInfoService.updateById(docInfo);

                            // æ›´æ–°è®¾å¤‡å…³è”
                            if (!updateDeviceLink(thirdDeProgramSource.getEquipmentId(), docInfo.getDocId(), sendDocClass)) {
                                return createErrorModel(model, "更新设备文档关联失败");
                            }
                        }
                    }

                    if (!success) {
                        return createErrorModel(model, "处理3DE NC文件失败");
                    }
                }
            }

            return model;
        } catch (Exception e) {
            log.error("处理3DE程序数据异常: {}", e.getMessage(), e);
            return createErrorModel(model, "处理3DE程序数据异常: " + e.getMessage());
        }
    }

    /**
     * æ·»åŠ åˆ°è®¾å¤‡
     */
    private boolean linkToDevice(String equipmentId, String docId, DocFile docFile, DocClassification sendDocClass) {
        try {
            DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(equipmentId);
            if (deviceInfo == null) {
                log.error("DNC中设备不存在: {}", equipmentId);
                return false;
            }
            DocRelative deviceDocRelative = new DocRelative();
            deviceDocRelative.setAttributionId(deviceInfo.getDeviceId());
            deviceDocRelative.setDocId(docId);
            deviceDocRelative.setAttributionType(4);
            deviceDocRelative.setClassificationId(sendDocClass.getClassificationId());
            boolean saved = docRelativeService.save(deviceDocRelative);
            if (!saved) {
                log.error("保存设备文档关联失败: device={}, doc={}", equipmentId, docId);
                return false;
            }
            // å¤åˆ¶æ–‡ä»¶åˆ°è®¾å¤‡è·¯å¾„
            List<String> groupPaths = deviceGroupService.findListParentTreeAll(deviceInfo.getGroupId());
            if (groupPaths != null && !groupPaths.isEmpty()) {
                String devicePath = String.join("/", groupPaths) + "/" + deviceInfo.getDeviceNo();
                // å¤åˆ¶æ–‡ä»¶
                boolean copySuccess = FileUtil.copyFileNc(
                        docFile.getFilePath(),
                        devicePath,
                        docFile.getFileEncodeName(),
                        docFile.getFileName(),
                        docFile.getFileSuffix());

                if (!copySuccess) {
                    log.error("文件复制失败: {} -> {}", docFile.getFilePath(), devicePath);
                    return false;
                }

                // åˆ é™¤æ—§ç‰ˆæœ¬æ–‡ä»¶
                FileUtil.deleteZipFromToSend(
                        devicePath,
                        docFile.getFileName(),
                        docFile.getFileSuffix());
            }

            return true;
        } catch (Exception e) {
            log.error("添加设备文档关联异常: {}", e.getMessage(), e);
            return false;
        }
    }

    /**
     * æ›´æ–°è®¾å¤‡å…³è”
     */
    private boolean updateDeviceLink(String equipmentId, String docId, DocClassification sendDocClass) {
        try {
            DeviceInfo deviceInfo = deviceInfoService.getByDeviceNo(equipmentId);
            if (deviceInfo == null) {
                log.error("DNC中设备不存在: {}", equipmentId);
                return false;
            }

            // æ£€æŸ¥å…³è”是否已存在
            DocRelative existingRel = docRelativeService.findDocRelative(docId,sendDocClass.getClassificationId(), 4,deviceInfo.getDeviceId());
            if (existingRel == null) {
                // åˆ›å»ºæ–°å…³è”
                DocRelative deviceDocRelative = new DocRelative();
                deviceDocRelative.setAttributionId(deviceInfo.getDeviceId());
                deviceDocRelative.setDocId(docId);
                deviceDocRelative.setAttributionType(4);
                deviceDocRelative.setClassificationId(sendDocClass.getClassificationId());
                return docRelativeService.save(deviceDocRelative);
            }
            return true;
        } catch (Exception e) {
            log.error("更新设备关联异常: {}", e.getMessage(), e);
            return false;
        }
    }

    /**
     * ä¸º3DE数据创建旧版本NC文件备份
     */
    private boolean createFileOldNcPathAndCopyFor3DE(DocInfo docInfo, ThirdDeProgramSource thirdDeProgramSource) {
        DocFile docFile = docFileService.getDocFileNearest(docInfo.getDocId());
        if (docFile == null) {
            log.error("未找到最近版本的3DE文档文件，docId: {}", docInfo.getDocId());
            return false;
        }
        String directoryPath = String.join(File.separator,
                "3de_bak",
                thirdDeProgramSource.getNcPlantName(),
                thirdDeProgramSource.getPartNo(),
                thirdDeProgramSource.getSkgxId(),
                "");

        File directory = new File(directoryPath);
        if (!directory.exists() && !directory.mkdirs()) {
            log.error("创建3DE目录失败: {}", directoryPath);
            return false;
        }

        // æž„建目标文件路径
        String targetFileName = buildTargetFileName(docFile);
        String targetFilePath = directoryPath + targetFileName;

        try {
            Path sourcePath = Paths.get(docFile.getFilePath());
            Path targetPath = Paths.get(targetFilePath);
            Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
            log.info("3DE文件复制成功: {} -> {}", docFile.getFilePath(), targetFilePath);
            return true;
        } catch (IOException e) {
            log.error("3DE文件复制失败: {}", e.getMessage(), e);
            if (directory.exists() && isDirectoryEmpty(directory)) {
                directory.delete();
            }
            return false;
        }
    }

    /**
     * ä¿å­˜é›¶ä»¶æƒé™
     */
    private boolean savePartsPermission(PartsInfo partsInfo, String productId) {
        List<PermissionStream> oldPermissionList = permissionStreamService.getAllByProductId(productId);
        if (CollectionUtils.isEmpty(oldPermissionList)) {
            return true;
        }

        List<PartsDepartment> partsDepartPermList = new ArrayList<>();
        List<PermissionStream> partsPermList = new ArrayList<>();
        List<PartsPermission> partsUserPermList = new ArrayList<>();

        for (PermissionStream p : oldPermissionList) {
            if (ValidateUtil.validateString(p.getUserId())) {
                // ç”¨æˆ·æƒé™
                PartsPermission permission = new PartsPermission();
                permission.setPartsId(partsInfo.getPartsId());
                permission.setUserId(p.getUserId());
                partsUserPermList.add(permission);

                PermissionStream stream = new PermissionStream();
                stream.setUserId(p.getUserId());
                stream.setProductId(partsInfo.getProductId());
                stream.setComponentId(partsInfo.getComponentId());
                stream.setPartsId(partsInfo.getPartsId());
                partsPermList.add(stream);
            }

            if (ValidateUtil.validateString(p.getDepartId())) {
                // éƒ¨é—¨æƒé™
                PartsDepartment department = new PartsDepartment();
                department.setPartsId(partsInfo.getPartsId());
                department.setDepartId(p.getDepartId());
                partsDepartPermList.add(department);

                PermissionStream stream = new PermissionStream();
                stream.setProductId(partsInfo.getProductId());
                stream.setComponentId(partsInfo.getComponentId());
                stream.setPartsId(partsInfo.getPartsId());
                stream.setDepartId(p.getDepartId());
                partsPermList.add(stream);
            }
        }

        boolean success = true;
        if (!partsUserPermList.isEmpty()) {
            success = success && partsPermissionService.saveBatch(partsUserPermList);
        }
        if (!partsDepartPermList.isEmpty()) {
            success = success && partsDepartmentService.saveBatch(partsDepartPermList);
        }
        if (!partsPermList.isEmpty()) {
            success = success && permissionStreamService.saveBatch(partsPermList);
        }

        return success;
    }

    private MesResultModel createErrorModel(MesResultModel model, String errorMsg) {
        model.setSuccFlag("失败");
        model.setError(errorMsg);
        return model;
    }

    /**
     * * NC程序齐套接口（MES）-DNC系统接收到PLM传的NC程序，将程序包对应的零件号、工序号、设备编号传给MES系统
     * å®šæ—¶æ‰«æPlmProgramSourceInfo表中的数据，进行数据同步，每分钟同步一次
     */
    @Scheduled(cron = "0 0/1 * * * ?")
    @Transactional(rollbackFor = Exception.class)
    public void syncWorkmanship() {
        // èŽ·å–所有需要同步的数据
        List<PlmProgramSourceInfo> plmProgramSourceInfos = iPlmProgramSourceInfoService.list(
                new LambdaQueryWrapper<PlmProgramSourceInfo>()
                        .eq(PlmProgramSourceInfo::getMesStatus, "0")
                        .orderByAsc(PlmProgramSourceInfo::getId)
        );

        if (plmProgramSourceInfos.isEmpty()) {
            log.info("无待同步数据，跳过处理");
            return;
        }

        List<NcProgramInfo> ncProgramInfos = plmProgramSourceInfos.stream().map(item -> {
            NcProgramInfo ncProgramInfo = new NcProgramInfo();
            ncProgramInfo.setMdsItemCode(item.getCzkAe8nPartNo());
            ncProgramInfo.setRevisionNo(item.getRevisionNo());
            ncProgramInfo.setNcProgramName(item.getFileName());
            ncProgramInfo.setOpreationSeqNo(item.getCzkAe8nOpNo());
            ncProgramInfo.setEquipmentId(item.getCzkAe8nEquipNo());
            ncProgramInfo.setWorkshop(item.getCzkAe8nDivision());
//            ncProgramInfo.setMesId(item.getId()); // ç¡®ä¿ç”Ÿæˆç¬¦åˆè¦æ±‚çš„mesId
//            ncProgramInfo.setOperFlag();
            return ncProgramInfo;
        }).collect(Collectors.toList());

        log.info("WebService-NC程序齐套接口（MES）同步开始，时间: {}", new Date());
        try {
            String jsonPayload = JSONObject.toJSONString(ncProgramInfos);
            log.debug("上报数据: {}", jsonPayload);

            // è°ƒç”¨WebService并获取详细响应
            String result = CxfClientUtil.invokeService(url, jsonPayload, namespace, method);
            log.info("接口响应: {}", result);

            // è§£æžå“åº”结果，只会有成功和失败
            if (result.contains("成功")) {
                List<PlmProgramSourceInfo> toUpdate = new ArrayList<>();

                plmProgramSourceInfos.forEach(item -> {
                    item.setMesStatus("1");
                    toUpdate.add(item);
                });
                // æ‰¹é‡æ›´æ–°çŠ¶æ€
                if (!toUpdate.isEmpty()) {
                    iPlmProgramSourceInfoService.updateBatchById(toUpdate);
                    log.info("成功更新{}条数据状态", toUpdate.size());
                }
            }else {
                log.error("同步MES系统失败: {}", result);
            }
        } catch (Exception e) {
            log.error("同步MES系统失败: {}", e.getMessage(), e);
            // ä»…标记处理失败的记录
            plmProgramSourceInfos.forEach(item -> item.setMesStatus("0"));
            iPlmProgramSourceInfoService.updateBatchById(plmProgramSourceInfos);
            throw new RuntimeException("同步失败，已回滚状态", e); // è§¦å‘事务回滚
        }
    }

    /**
@@ -644,17 +844,6 @@
        }
        String[] files = directory.list();
        return files == null || files.length == 0;
    }

    private static String buildRequestBody(NcProgramInfo ncProgramInfo) {
        StringBuilder body = new StringBuilder();
        body.append("mesId=").append(ncProgramInfo.getMesId())
                .append("&mdsItemCode=").append(ncProgramInfo.getMdsItemCode())
                .append("&revisionNo=").append(ncProgramInfo.getRevisionNo())
                .append("&opreationSeqNo=").append(ncProgramInfo.getOpreationSeqNo())
                .append("&equipmentId=").append(ncProgramInfo.getEquipmentId())
                .append("&workshop=").append(ncProgramInfo.getWorkshop());
        return body.toString();
    }



 src/main/resources/application.yml

@@ -10,7 +10,7 @@
  application:
    name: lxzn-dev-admin
  datasource:
    url: jdbc:mysql://127.0.0.1:3316/lxzn_qlj_nc?useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
    url: jdbc:mysql://127.0.0.1:3316/lxzn_qlj_nc?serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&tinyInt1isBit=false&nullCatalogMeansCurrent=true&characterEncoding=utf8
    username: root
    password: 123456
    driver-class-name: com.mysql.cj.jdbc.Driver
@@ -42,11 +42,13 @@
        maxIdle: 3
        minIdle: 1
        maxWait: -1 #连接池最大等行时间 -1没有限制
    database: 5
  activiti:
    check-process-definitions: true
    database-schema-update: true
    db-history-used: true
    history-level: full
    async-executor-activate: false
  servlet:
    multipart:
      #默认支持文件上传.
@@ -116,9 +118,6 @@
dnc:
  server:
    url: http://localhost:8199
ncPdm:
  file_path:
    d://lxzn_storage/plm
fileOldNcPath: dnc//plm_bak  #旧文件记录地址
webservice:
  url: http://20.10.193.21:9308/webservice/mes/eqiupment/v1/mdc2mes.asmx?wsdl

 src/main/resources/com.lxzn.base.dao/MdcPassLogMapper.xml

@@ -1,9 +1,11 @@
<?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="com.lxzn.base.dao.DncPassLogMapper">
    <select id="findDateTimeDay" resultType="DncPassLog" parameterType="String">
        select top 1 *
        from dnc_pass_log u
        where day_time = #{dayTime} order by create_time desc
    <select id="findDateTimeDay" resultType="com.lxzn.framework.domain.base.DncPassLog" parameterType="String">
        SELECT *
        FROM dnc_pass_log u
        WHERE day_time = #{dayTime}
        ORDER BY create_time DESC
        LIMIT 1;
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/ComponentDepartmentMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.ComponentDepartmentMapper">
    <select id="getDepartPermsByComponentId" resultType="Department" parameterType="String">
    <select id="getDepartPermsByComponentId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -14,7 +14,7 @@
        on u.depart_id=p.depart_id
    </select>

    <select id="getDepartNonPermsByComponentId" resultType="Department" parameterType="String">
    <select id="getDepartNonPermsByComponentId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -24,4 +24,4 @@
        from sys_department u
        where u.depart_id not in (select depart_id from nc_component_department where component_id=#{componentId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/ComponentPermissionMapper.xml

@@ -14,7 +14,7 @@
        on u.user_id=p.user_id
    </select>

    <select id="getUserNonPermsByComponentId" resultType="User" parameterType="String">
    <select id="getUserNonPermsByComponentId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
        select u.user_id
        , u.username
        , u.nickname
@@ -24,4 +24,4 @@
        from sys_user u
        where u.user_id not in (select user_id from nc_component_permission where component_id=#{componentId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/DeviceGroupDepartMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.DeviceGroupDepartMapper">
    <select id="getDepartPermsByGroupId" resultType="Department" parameterType="String">
    <select id="getDepartPermsByGroupId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -14,7 +14,7 @@
        on u.depart_id=p.depart_id
    </select>

    <select id="getDepartNonPermsByGroupId" resultType="Department" parameterType="String">
    <select id="getDepartNonPermsByGroupId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -24,4 +24,4 @@
        from sys_department u
        where u.depart_id not in (select depart_id from nc_device_group_department where group_id=#{groupId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/DeviceGroupMapper.xml

@@ -39,17 +39,17 @@
        where parent_id=#{parentId} and delete_flag=0
    </select>

    <resultMap id="deviceGroupExtPermsMap" type="DeviceGroupExt">
    <resultMap id="deviceGroupExtPermsMap" type="com.lxzn.framework.domain.nc.ext.DeviceGroupExt">
        <id column="group_id"  property="groupId" />
        <result column="user_id" property="userId" />
        <collection column="{parentId=group_id, userId=user_id}" property="children"
                    javaType="ArrayList" ofType="DeviceGroupExt" select="getByParentIdAndUserPerms">
                    javaType="ArrayList" ofType="com.lxzn.framework.domain.nc.ext.DeviceGroupExt" select="getByParentIdAndUserPerms">
            <id column="group_id"  property="groupId" />
            <result column="user_id" property="userId" />
        </collection>
    </resultMap>

    <resultMap id="deviceGroupExtPermsMapAs" type="DeviceGroupExt">
    <resultMap id="deviceGroupExtPermsMapAs" type="com.lxzn.framework.domain.nc.ext.DeviceGroupExt">
        <id column="group_id"  property="groupId" />
        <association property="parent" column="{id=parent_id}" select="findById">
        </association>

 src/main/resources/com.lxzn.nc.dao/DeviceGroupPermissionMapper.xml

@@ -14,7 +14,7 @@
        on u.user_id=p.user_id
    </select>

    <select id="getUserNonPermsByGroupId" resultType="User" parameterType="String">
    <select id="getUserNonPermsByGroupId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
        select u.user_id
        , u.username
        , u.nickname
@@ -24,4 +24,4 @@
        from sys_user u
        where u.user_id not in (select user_id from nc_device_group_permission where group_id=#{groupId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/DeviceInfoMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.DeviceInfoMapper">
    <select id="getDeviceByUserPermed" resultType="DeviceInfo" parameterType="String">
    <select id="getDeviceByUserPermed" resultType="com.lxzn.framework.domain.nc.DeviceInfo" parameterType="String">
          select d.device_id
          , d.group_id
          , d.device_no

 src/main/resources/com.lxzn.nc.dao/DevicePermissionMapper.xml

@@ -14,7 +14,7 @@
        on u.user_id=p.user_id
    </select>

    <select id="getUserNonPermsByDeviceId" resultType="User" parameterType="String">
    <select id="getUserNonPermsByDeviceId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
        select u.user_id
        , u.username
        , u.nickname
@@ -24,4 +24,4 @@
        from sys_user u
        where u.user_id not in (select user_id from nc_device_permission where device_id=#{deviceId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/DocInfoMapper.xml

@@ -4,7 +4,7 @@
    <delete id="deleteByDocId">
        delete from nc_doc_info where doc_id = #{docId}
    </delete>
    <select id="findDocExtList" parameterType="String" resultType="DocInfo">
    <select id="findDocExtList" parameterType="String" resultType="com.lxzn.framework.domain.nc.DocInfo">
        select
        u.doc_id
        ,r.classification_id
@@ -36,7 +36,7 @@
    </select>


    <select id="findDeviceDocExtList" parameterType="String" resultType="DocInfo">
    <select id="findDeviceDocExtList" parameterType="String" resultType="com.lxzn.framework.domain.nc.DocInfo">
        select
        u.doc_id
        ,r.classification_id
@@ -70,7 +70,7 @@
        ${ew.customSqlSegment}
    </select>

    <select id="findByAttrAndDocName" parameterType="Map" resultType="DocInfo">
    <select id="findByAttrAndDocName" parameterType="Map" resultType="com.lxzn.framework.domain.nc.DocInfo">
        select r.doc_id
        ,r.attribution_id
        ,r.attribution_type
@@ -89,7 +89,7 @@
        where d.delete_flag=0 and d.doc_name=#{docName} and d.doc_suffix=#{docSuffix}
    </select>

    <select id="getByDocAttrAndDocId" parameterType="Map" resultType="DocInfo">
    <select id="getByDocAttrAndDocId" parameterType="Map" resultType="com.lxzn.framework.domain.nc.DocInfo">
        select r.doc_id
        ,r.attribution_id
        ,r.attribution_type
@@ -109,7 +109,7 @@
        where d.delete_flag=0
    </select>

    <select id="getByDocId" parameterType="String" resultType="DocInfo">
    <select id="getByDocId" parameterType="String" resultType="com.lxzn.framework.domain.nc.DocInfo">
        select r.doc_id
        ,r.attribution_id
        ,r.attribution_type

 src/main/resources/com.lxzn.nc.dao/DocRelativeMapper.xml

@@ -4,7 +4,7 @@
    <delete id="deleteById">
        delete from nc_doc_relative where doc_id = #{docId}
    </delete>
    <select id="findDeviceByDocId" resultType="DeviceInfo" parameterType="String">
    <select id="findDeviceByDocId" resultType="com.lxzn.framework.domain.nc.DeviceInfo" parameterType="String">
         select d.device_id
          , d.group_id
          , d.device_no

 src/main/resources/com.lxzn.nc.dao/PartsDepartmentMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.PartsDepartmentMapper">
    <select id="getDepartPermsByPartsId" resultType="Department" parameterType="String">
    <select id="getDepartPermsByPartsId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -14,7 +14,7 @@
        on u.depart_id=p.depart_id
    </select>

    <select id="getDepartNonPermsByProductId" resultType="Department" parameterType="String">
    <select id="getDepartNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -24,4 +24,4 @@
        from sys_department u
        where u.depart_id not in (select depart_id from nc_parts_department where parts_id=#{partsId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/PartsInfoMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.PartsInfoMapper">
    <select id="getByUserPerms" resultType="PartsInfo" parameterType="String">
    <select id="getByUserPerms" resultType="com.lxzn.framework.domain.nc.PartsInfo" parameterType="String">
        select p.parts_id
        , p.parts_name
        , p.product_id

 src/main/resources/com.lxzn.nc.dao/PartsPermissionMapper.xml

@@ -14,7 +14,7 @@
        on u.user_id=p.user_id
    </select>

    <select id="getUserNonPermsByProductId" resultType="User" parameterType="String">
    <select id="getUserNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
        select u.user_id
        , u.username
        , u.nickname
@@ -24,4 +24,4 @@
        from sys_user u
        where u.user_id not in (select user_id from nc_parts_permission where parts_id=#{partsId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/ProductDepartmentMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.ProductDepartmentMapper">
    <select id="getDepartPermsByProductId" resultType="Department" parameterType="String">
    <select id="getDepartPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -14,7 +14,7 @@
        on u.depart_id=p.depart_id
    </select>

    <select id="getDepartNonPermsByProductId" resultType="Department" parameterType="String">
    <select id="getDepartNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select u.depart_id
        , u.depart_name
        , u.depart_code
@@ -24,4 +24,4 @@
        from sys_department u
        where u.depart_id not in (select depart_id from nc_product_department where product_id=#{productId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.nc.dao/ProductInfoMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.nc.dao.ProductInfoMapper">
    <select id="getByUserPerms" resultType="ProductInfo" parameterType="String">
    <select id="getByUserPerms" resultType="com.lxzn.framework.domain.nc.ProductInfo" parameterType="String">
        select p.product_id
        , p.product_no
        , p.product_model

 src/main/resources/com.lxzn.nc.dao/ProductPermissionMapper.xml

@@ -14,7 +14,7 @@
        on u.user_id=p.user_id
    </select>

    <select id="getUserNonPermsByProductId" resultType="User" parameterType="String">
    <select id="getUserNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
        select u.user_id
        , u.username
        , u.nickname
@@ -24,4 +24,4 @@
        from sys_user u
        where u.user_id not in (select user_id from nc_product_permission where product_id=#{productId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.ucenter.dao/ButtonMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.ucenter.dao.ButtonMapper">
        <select id="getButtonPerms" parameterType="String" resultType="Button">
        <select id="getButtonPerms" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.Button">
                select distinct b.button_id
                , b.button_perm
                , b.button_name
@@ -15,7 +15,7 @@
        </select>


        <select id="getMenuButtonPerms" parameterType="java.util.Map" resultType="Button">
        <select id="getMenuButtonPerms" parameterType="java.util.Map" resultType="com.lxzn.framework.domain.ucenter.Button">
                select distinct b.button_id
                , b.button_perm
                , b.button_name
@@ -33,7 +33,7 @@
                where u.user_id=#{userId}
        </select>

        <select id="getObjectButtonPerms" parameterType="java.util.Map" resultType="Button">
        <select id="getObjectButtonPerms" parameterType="java.util.Map" resultType="com.lxzn.framework.domain.ucenter.Button">
                select distinct b.button_id
                , b.button_perm
                , b.button_name
@@ -50,4 +50,4 @@
                on u.role_id=r.role_id
                where u.user_id=#{userId}
        </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.ucenter.dao/DepartmentMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.ucenter.dao.DepartmentMapper">
    <select id="getUserPermDepart" resultType="Department" parameterType="String">
    <select id="getUserPermDepart" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select r.depart_id, r.depart_name, r.depart_code, r.description
        from
        (select depart_id, depart_name, depart_code, description from sys_department where delete_flag=0) r
@@ -10,7 +10,7 @@
        on r.depart_id=ur.depart_id
    </select>

    <select id="getUserNonPermDepart" resultType="Department" parameterType="String">
    <select id="getUserNonPermDepart" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
        select r.depart_id, r.depart_name, r.depart_code, r.description
        from (select depart_id, depart_name, depart_code, description from sys_department where delete_flag=0) r
        where r.depart_id not in
@@ -51,7 +51,7 @@
        where delete_flag = 0 and parent_id=#{parentId}
    </select>

    <select id="getUserApproveDepart" parameterType="String" resultType="User">
    <select id="getUserApproveDepart" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.User">
        select u.user_id
        , u.username
        , u.nickname
@@ -68,7 +68,7 @@
        on u.user_id=d.user_id
    </select>

    <select id="getUserNonApproveDepart" parameterType="String" resultType="User">
    <select id="getUserNonApproveDepart" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.User">
        select u.user_id
        , u.username
        , u.nickname
@@ -83,4 +83,4 @@
        from sys_user u
        where u.user_id not in (select user_id from sys_depart_approve_user where depart_id=#{departId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.ucenter.dao/MenuMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.ucenter.dao.MenuMapper">
    <select id="findByUserId" parameterType="String" resultType="Menu">
    <select id="findByUserId" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.Menu">
        select m.menu_id
        , m.perm_code
        , m.menu_name
@@ -23,13 +23,13 @@
        3、多级关联语句是分开查询的  æ•°æ®é‡å¤§çš„情况下性能低下
        4、如果确定级树 å¯ä»¥ä½¿ç”¨çº§è”查询一次查询 ä¾‹å­ï¼š
    -->
    <resultMap id="menuExtBaseResult" type="MenuExt">
    <resultMap id="menuExtBaseResult" type="com.lxzn.framework.domain.ucenter.ext.MenuExt">
        <id column="menu_id"  property="menuId" />
        <collection column="menu_id" property="childList" select="findByParentId">
        </collection>
    </resultMap>

    <resultMap id="menuExtSingleSelectResult" type="MenuExt">
    <resultMap id="menuExtSingleSelectResult" type="com.lxzn.framework.domain.ucenter.ext.MenuExt">
        <id column="menu_id_one"  property="menuId" />
        <result column="perm_code_one" property="permCode" />
        <result column="menu_name_one" property="menuName" />
@@ -38,7 +38,7 @@
        <result column="icon_cls_one" property="iconCls" />
        <result column="priority_one" property="priority" />
        <result column="rank_level_one" property="rankLevel" />
        <collection  property="childList" ofType="MenuExt">
        <collection  property="childList" ofType="com.lxzn.framework.domain.ucenter.ext.MenuExt">
            <id column="menu_id_two"  property="menuId" />
            <result column="perm_code_two" property="permCode" />
            <result column="menu_name_two" property="menuName" />
@@ -47,7 +47,7 @@
            <result column="icon_cls_two" property="iconCls" />
            <result column="priority_two" property="priority" />
            <result column="rank_level_two" property="rankLevel" />
            <collection  property="childList" ofType="MenuExt">
            <collection  property="childList" ofType="com.lxzn.framework.domain.ucenter.ext.MenuExt">
                <id column="menu_id_three"  property="menuId" />
                <result column="perm_code_three" property="permCode" />
                <result column="menu_name_three" property="menuName" />
@@ -120,4 +120,4 @@
        on cm.parent_id = bm.menu_id
        where am.rank_level=1 and am.delete_flag=0
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.ucenter.dao/RoleMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.ucenter.dao.RoleMapper">
    <select id="getUserPermRole" resultType="Role" parameterType="String">
    <select id="getUserPermRole" resultType="com.lxzn.framework.domain.ucenter.Role" parameterType="String">
        select r.role_id, r.role_code, r.role_name, r.description
        from
        (select role_id, role_code, role_name, description from sys_role where delete_flag=0) r
@@ -10,10 +10,10 @@
        on r.role_id=ur.role_id
    </select>

    <select id="getUserNonPermRole" resultType="Role" parameterType="String">
    <select id="getUserNonPermRole" resultType="com.lxzn.framework.domain.ucenter.Role" parameterType="String">
        select r.role_id, r.role_code, r.role_name, r.description
        from (select role_id, role_code, role_name, description from sys_role where delete_flag=0) r
        where r.role_id not in
        (select role_id from sys_user_role where user_id=#{userId})
    </select>
</mapper>
</mapper>

 src/main/resources/com.lxzn.ucenter.dao/UserMapper.xml

@@ -1,7 +1,7 @@
<?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="com.lxzn.ucenter.dao.UserMapper">
    <select id="findUserExtByUsername" parameterType="String" resultType="UserExt">
    <select id="findUserExtByUsername" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.ext.UserExt">
        select
        u.user_id
        ,u.username
@@ -18,7 +18,7 @@
        ${ew.customSqlSegment}
    </select>

    <resultMap id="userDepartExt" type="UserDepartExt">
    <resultMap id="userDepartExt" type="com.lxzn.framework.domain.ucenter.ext.UserDepartExt">
        <id column="user_id"  property="userId" />
        <collection column="user_id" property="departs" select="com.lxzn.ucenter.dao.DepartmentMapper.getUserPermDepart">
        </collection>
@@ -55,4 +55,4 @@
        from sys_user u
        where u.delete_flag=0
    </select>
</mapper>
</mapper>

 src/main/resources/processes/assign_nc_to_device.bpmn

@@ -1,61 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1589077876043" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
  <process id="assign_nc_to_device" isClosed="false" isExecutable="true" name="指派NC文档到设备" processType="None">
    <startEvent id="_2" name="StartEvent"/>
    <userTask activiti:assignee="${apply_user}" activiti:exclusive="true" id="_3" name="提交申请"/>
    <userTask activiti:candidateUsers="${approve_users}" activiti:exclusive="true" id="_4" name="审批"/>
    <endEvent id="_5" name="EndEvent"/>
    <sequenceFlow id="_6" sourceRef="_2" targetRef="_3"/>
    <sequenceFlow id="_7" sourceRef="_3" targetRef="_4"/>
    <sequenceFlow id="_8" sourceRef="_4" targetRef="_5"/>
  </process>
  <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
    <bpmndi:BPMNPlane bpmnElement="assign_nc_to_device">
      <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
        <omgdc:Bounds height="32.0" width="32.0" x="40.0" y="135.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
        <omgdc:Bounds height="55.0" width="85.0" x="145.0" y="125.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
        <omgdc:Bounds height="55.0" width="85.0" x="335.0" y="125.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
        <omgdc:Bounds height="32.0" width="32.0" x="545.0" y="135.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNShape>
      <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_3">
        <omgdi:waypoint x="72.0" y="151.0"/>
        <omgdi:waypoint x="145.0" y="152.5"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_3" targetElement="_4">
        <omgdi:waypoint x="230.0" y="152.5"/>
        <omgdi:waypoint x="335.0" y="152.5"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
      <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_4" targetElement="_5">
        <omgdi:waypoint x="420.0" y="152.5"/>
        <omgdi:waypoint x="545.0" y="151.0"/>
        <bpmndi:BPMNLabel>
          <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
        </bpmndi:BPMNLabel>
      </bpmndi:BPMNEdge>
    </bpmndi:BPMNPlane>
  </bpmndi:BPMNDiagram>
    <process id="assign_nc_to_device" isClosed="false" isExecutable="true" name="指派NC文档到设备" processType="None">
        <startEvent id="_2" name="StartEvent"/>
        <userTask activiti:assignee="${apply_user}" activiti:exclusive="true" id="_3" name="提交申请"/>
        <userTask activiti:candidateUsers="${approve_users}" activiti:exclusive="true" id="_4" name="审批"/>
        <endEvent id="_5" name="EndEvent"/>
        <sequenceFlow id="_6" sourceRef="_2" targetRef="_3"/>
        <sequenceFlow id="_7" sourceRef="_3" targetRef="_4"/>
        <sequenceFlow id="_8" sourceRef="_4" targetRef="_5"/>
    </process>
    <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
        <bpmndi:BPMNPlane bpmnElement="assign_nc_to_device">
            <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
                <omgdc:Bounds height="32.0" width="32.0" x="40.0" y="135.0"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNShape>
            <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
                <omgdc:Bounds height="55.0" width="85.0" x="145.0" y="125.0"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNShape>
            <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
                <omgdc:Bounds height="55.0" width="85.0" x="335.0" y="125.0"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNShape>
            <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
                <omgdc:Bounds height="32.0" width="32.0" x="545.0" y="135.0"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNShape>
            <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_3">
                <omgdi:waypoint x="72.0" y="151.0"/>
                <omgdi:waypoint x="145.0" y="152.5"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNEdge>
            <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_3" targetElement="_4">
                <omgdi:waypoint x="230.0" y="152.5"/>
                <omgdi:waypoint x="335.0" y="152.5"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNEdge>
            <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_4" targetElement="_5">
                <omgdi:waypoint x="420.0" y="152.5"/>
                <omgdi:waypoint x="545.0" y="151.0"/>
                <bpmndi:BPMNLabel>
                    <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
                </bpmndi:BPMNLabel>
            </bpmndi:BPMNEdge>
        </bpmndi:BPMNPlane>
    </bpmndi:BPMNDiagram>
</definitions>