From 5e637cd18c2baef75d1bf6a349e31df690b29bef Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期一, 27 五月 2024 09:23:49 +0800
Subject: [PATCH] 增加工具类：获取当前切割机正在切割的版图号
---
hangzhoumesParent/moduleService/CacheGlassModule/pom.xml | 5 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/SmbTool.java | 71 +++++++++++++++++++++++++++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java | 5 +-
3 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index eabe196..568e912 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -22,6 +22,11 @@
<artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
+ <dependency>
+ <groupId>org.samba.jcifs</groupId>
+ <artifactId>jcifs</artifactId>
+ <version>1.2.19</version>
+ </dependency>
<!-- <dependency>-->
<!-- <groupId>com.github.yulichang</groupId>-->
<!-- <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/SmbTool.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/SmbTool.java
new file mode 100644
index 0000000..2b5c9d5
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/SmbTool.java
@@ -0,0 +1,71 @@
+package com.mes.common;
+
+import jcifs.smb.NtlmPasswordAuthentication;
+import jcifs.smb.SmbFile;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class SmbTool {
+ public static String USER_DOMAIN=null;//鍏变韩璁＄畻鏈篿p "192.168.3.102";
+ public static String USER_ACCOUNT=null;//鐧诲綍鍏变韩鏂囦欢澶� 鐢ㄦ埛鍚� "aaa"锛屽鏋滄槸鍏变韩鏄棤瀵嗙爜妯″紡 姝ゅ鍊艰缃负 null;
+ public static String USER_PWS=null;//鐧诲綍鍏变韩鏂囦欢澶� 瀵嗙爜"guoyujie"锛屽鏋滄槸鍏变韩鏄棤瀵嗙爜妯″紡 姝ゅ鍊艰缃负 null;
+
+ /**
+ * test 娴嬭瘯绀轰緥
+ */
+ private void test()
+ {
+ int index= SmbTool.getDescriptionIndex("log","P20240522");//杈撳叆鍒囧壊鏈哄叡浜枃浠跺す鍚嶅瓧銆佸伐绋嬪彿锛岃繑鍥炲綋鍓嶅伐绋嬫鍦ㄥ垏鍓茬殑鐗堝浘鍙�
+ System.out.print(index);
+ }
+ /**
+ * smbGetall 杩斿洖鎸囧畾鐩綍涓嬬殑鏂囦欢鍚嶅瓧
+ * @param GoalUrl 杩滅鐩綍锛�"smb://192.168.2.100//ceshi//"锛�
+ */
+ public static String[] smbGetallFilenames(String GoalUrl) {
+ NtlmPasswordAuthentication auth=new NtlmPasswordAuthentication(USER_DOMAIN,USER_ACCOUNT,USER_PWS);
+ List<String> filenames=new ArrayList<>();
+ try {
+ SmbFile remoteFile = new SmbFile(GoalUrl,auth);
+ if (remoteFile == null) {
+ return filenames.toArray(new String[]{});
+ }
+ if (remoteFile.exists())
+ {
+ SmbFile[] listFiles = remoteFile.listFiles();
+ for(int i = 0; i < listFiles.length; i++) {
+ filenames.add(listFiles[i].getName());
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return filenames.toArray(new String[]{});
+ }
+ /**
+ * getDescriptionIndex 鏍规嵁宸ョ▼鍙凤紝杩斿洖褰撳墠姝ｅ湪鍒囧壊鐨勭増鍥惧彿
+ * @param folderName 鍏变韩鏂囦欢澶瑰悕瀛�
+ * @param project_no 宸ョ▼鍙�
+ */
+ public static int getDescriptionIndex(String folderName,String project_no)
+ {
+ SimpleDateFormat formatter= new SimpleDateFormat("yyyyMMdd");
+ Date date = new Date(System.currentTimeMillis());
+ System.out.println(formatter.format(date));
+ String[] getfilenames= smbGetallFilenames("smb://"+USER_DOMAIN+"/"+folderName+"/"+formatter.format(date)+"/");
+ for (int i = 0; i < getfilenames.length; i++) {
+ String[] splitvalues= getfilenames[i].split("_");
+ if (splitvalues.length>=3&&splitvalues[1].trim().equals(project_no))
+ {
+ String[] indexstr= splitvalues[2].trim().split("\\.");
+ if (indexstr.length>1) {
+ return Integer.parseInt(indexstr[0]);
+ }
+ }
+ }
+ return -1;
+ }
+}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
index f5e434b..f56d0e5 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java
@@ -52,8 +52,9 @@
}
byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
- PlcMesObject.setPlcParameterList(getplcvlues);
-
+ if(getplcvlues!=null) {
+ PlcMesObject.setPlcParameterList(getplcvlues);
+ }
}
}
}
--
Gitblit v1.8.0