From 1eadcf2fe21a211ba361b3cdb86a79f34b4b0479 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 14 五月 2024 14:48:02 +0800
Subject: [PATCH] 修改出片逻辑
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/common/S7object.java | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 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 e5f4389..9ed7dba 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
@@ -3,34 +3,32 @@
import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.mes.tools.S7control;
-/**
- * @Author : zhoush
- * @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