From 68d56160c32384f8d939df0bd25bdc9c50b042b9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 30 十月 2023 11:08:04 +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 |   70 ++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 21 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 dca9e9c..593a8b9 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
@@ -18,9 +18,7 @@
 
     private S7control() {
         if (s7PLC == null)
-            s7PLC = new S7PLC(plcType, ip, port);
-           s7PLC.connect();
-            System.out.println(ip);
+            s7PLC = new S7PLC(plcType, ip, port,0,0);
     }
 
     // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
@@ -49,8 +47,10 @@
      * @param data    word鐨勫��
      */
     public void WriteWord(String address, short data) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
+        {
             return;
+        }
         s7PLC.writeInt16(address, data);
     }
 
@@ -61,7 +61,7 @@
      * @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);
@@ -79,7 +79,7 @@
      * @param datas   word鐨勫��
      */
     public void WriteWord(List<String> address, List<Short> datas) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         // s7PLC.write(address, data);
 
@@ -97,7 +97,7 @@
      * @param data    Bit鐨勫��
      */
     public void WriteBit(String address, Boolean data) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         s7PLC.writeBoolean(address, data);
     }
@@ -109,7 +109,7 @@
      * @param datas   bit鐨勫��
      */
     public void WriteBit(List<String> address, List<Boolean> datas) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         // s7PLC.write(address, data);
 
@@ -127,7 +127,7 @@
      * @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);
@@ -137,6 +137,18 @@
         }
         s7PLC.writeMultiData(addressWrite);
     }
+     /**
+     * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜byte
+     * 
+     * @param address 鍦板潃
+     * @param datas   byte鐨勫��
+     */
+    public void WriteByte(String address, byte[] datas) {
+        if (s7PLC==null)
+            return;
+        // s7PLC.write(address, data); 
+        s7PLC.writeByte(address, datas);
+    }
 
     /**
      * 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
@@ -145,9 +157,8 @@
      * @return 缁撴灉
      */
     public List<Short> ReadWord(List<String> address) {
-        if (!s7PLC.checkConnected())
-            return null;
-            
+        if (s7PLC==null)
+              return null;
         return s7PLC.readInt16(address);
     }
 
@@ -159,11 +170,25 @@
      * @return 缁撴灉
      */
     public List<Short> ReadWord(String address, int count) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+             return null;
 
         List<String> addresslist = GetAddressList(address, count, 16);
         return s7PLC.readInt16(addresslist);
+    }
+    /**
+     * 鎸夋寚瀹氱殑鍦板潃 璇诲彇byte缁撴灉闆�
+     * 
+     * @param address 鍦板潃
+     * @param count   杩炵画璇诲灏戜釜byte
+     * @return 缁撴灉
+     */
+    public byte[] ReadByte(String address, int count) {
+        if (s7PLC==null)
+             return null;
+
+       // List<String> addresslist = GetAddressList(address, count, 16);
+        return s7PLC.readByte(address,count);
     }
 
     /**
@@ -173,8 +198,8 @@
      * @return Boolean缁撴灉
      */
     public List<Boolean> ReadBits(List<String> addresslist) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+             return null;
         return s7PLC.readBoolean(addresslist);
     }
 
@@ -186,16 +211,16 @@
      * @return Boolean缁撴灉
      */
     public List<Boolean> ReadBits(String address, int count) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return null;
         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(".");
+        String[] stringdatas = address.trim().split("\\.");
         if (stringdatas.length < 2 || !address.startsWith("DB"))
             return null;
         int dbwindex = 0;
@@ -207,7 +232,8 @@
         } else
             return null;
 
-        for (int i = 0; i < count; i++) {
+            addresslist.add(address);
+        for (int i = 0; i < count-1; i++) {
 
             int bitcurrent = bitindex + addedbit;
             if (bitcurrent > 7) {
@@ -215,7 +241,9 @@
                 bitindex = 0;
             } else
                 bitindex = bitcurrent;
-            addresslist.add(stringdatas[0] + "." + dbwindex + "." + bitindex);
+
+                String endstr=stringdatas.length==3?"." + bitindex:"";
+            addresslist.add(stringdatas[0] + "." + dbwindex + endstr);
         }
         return addresslist;
     }

--
Gitblit v1.8.0