From c0505074f5149b7f0c7fe26822e793eac18319f3 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 五月 2024 11:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
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 45e5467..e5f4389 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
@@ -8,29 +8,29 @@
* @Date: 2024/4/9 15:13
* @Description:
*/
-public class S7object {
- public S7control plccontrol; // PLC閫氳绫诲疄渚�
- private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.1"; // plc ip鍦板潃
- private int port = 102; // plc 绔彛鍙�
-
- private static volatile S7object instance = null;
-
- private S7object() {
- if (plccontrol == null) {
- plccontrol = new S7control(plcType, ip, port, 0, 0);
- }
- }
-
- // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
- public static S7object getinstance() {
- if (instance == null) {
- synchronized (S7object.class) {
- if (instance == null) {
- instance = new S7object();
- }
- }
- }
- return instance;
- }
-}
+//public class S7object {
+// public S7control plccontrol; // PLC閫氳绫诲疄渚�
+// private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
+// private String ip = "192.168.10.1"; // plc ip鍦板潃
+// private int port = 102; // plc 绔彛鍙�
+//
+// private static volatile S7object instance = null;
+//
+// private S7object() {
+// if (plccontrol == null) {
+// plccontrol = new S7control(plcType, ip, port, 0, 0);
+// }
+// }
+//
+// // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
+// public static S7object getinstance() {
+// if (instance == null) {
+// synchronized (S7object.class) {
+// if (instance == null) {
+// instance = new S7object();
+// }
+// }
+// }
+// return instance;
+// }
+//}
--
Gitblit v1.8.0