From a010697a7f8d990cf49a2a919e201e15946f2a5d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 九月 2023 16:47:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/S7control.java |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 6119fae..30ff968 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -10,7 +10,7 @@
 public class S7control {
 
     S7PLC s7PLC; // PLC閫氳绫诲疄渚�
-    private EPlcType plcType = EPlcType.S1200; // 瑗块棬瀛怭LC绫诲瀷
+    private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
     private String ip = "192.168.10.1"; // plc ip鍦板潃
     private int port = 102; // plc 绔彛鍙�
 
@@ -18,7 +18,7 @@
 
     private S7control() {
         if (s7PLC == null)
-            s7PLC = new S7PLC(plcType, ip, port);
+            s7PLC = new S7PLC(plcType, ip, port,0,0);
     }
 
     // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
@@ -42,24 +42,26 @@
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓獁ord
-     * 
+     *
      * @param address 鍦板潃
      * @param data    word鐨勫��
      */
     public void WriteWord(String address, short data) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
+        {
             return;
+        }
         s7PLC.writeInt16(address, data);
     }
 
     /**
      * 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜word
-     * 
+     *
      * @param address 鍦板潃
      * @param datas   word鐨勫��
      */
     public void WriteWord(String address, List<Short> datas) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         // s7PLC.write(address, data);
         List<String> addresslist = GetAddressList(address, datas.size(), 16);
@@ -72,12 +74,12 @@
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜word
-     * 
+     *
      * @param address 鍦板潃
      * @param datas   word鐨勫��
      */
     public void WriteWord(List<String> address, List<Short> datas) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         // s7PLC.write(address, data);
 
@@ -90,24 +92,24 @@
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓狟it
-     * 
+     *
      * @param address 鍦板潃
      * @param data    Bit鐨勫��
      */
     public void WriteBit(String address, Boolean data) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         s7PLC.writeBoolean(address, data);
     }
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜bit
-     * 
+     *
      * @param address 鍦板潃
      * @param datas   bit鐨勫��
      */
     public void WriteBit(List<String> address, List<Boolean> datas) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         // s7PLC.write(address, data);
 
@@ -120,12 +122,12 @@
 
     /**
      * 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜bit
-     * 
+     *
      * @param address 鍦板潃
      * @param datas   word鐨勫��
      */
     public void WriteBit(String address, List<Boolean> datas) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         // s7PLC.write(address, data);
         List<String> addresslist = GetAddressList(address, datas.size(), 1);
@@ -138,26 +140,26 @@
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
-     * 
+     *
      * @param address 鍦板潃
      * @return 缁撴灉
      */
     public List<Short> ReadWord(List<String> address) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+            return new ArrayList<Short>();
         return s7PLC.readInt16(address);
     }
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
-     * 
+     *
      * @param address 鍦板潃
      * @param count   杩炵画璇诲灏戜釜word
      * @return 缁撴灉
      */
     public List<Short> ReadWord(String address, int count) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+            return new ArrayList<Short>();
 
         List<String> addresslist = GetAddressList(address, count, 16);
         return s7PLC.readInt16(addresslist);
@@ -170,8 +172,8 @@
      * @return Boolean缁撴灉
      */
     public List<Boolean> ReadBits(List<String> addresslist) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+            return new ArrayList<Boolean>();
         return s7PLC.readBoolean(addresslist);
     }
 
@@ -183,14 +185,14 @@
      * @return Boolean缁撴灉
      */
     public List<Boolean> ReadBits(String address, int count) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+            return new ArrayList<Boolean>();
         List<String> addresslist = GetAddressList(address, count, 1);
         return s7PLC.readBoolean(addresslist);
     }
 
     private List<String> GetAddressList(String address, int count, int addedbit) {
-        List<String> addresslist = new ArrayList<>();
+        List<String> addresslist = new ArrayList<String>();
 
         String[] stringdatas = address.split(".");
         if (stringdatas.length < 2 || !address.startsWith("DB"))
@@ -216,4 +218,4 @@
         }
         return addresslist;
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0