From 3aa3916d0574365548b2d12c225d3f5e0ec23887 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 16 九月 2023 07:57:45 +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 |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 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 5942a98..3ae24aa 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,15 +10,15 @@
 public class S7control {
 
     S7PLC s7PLC; // PLC閫氳绫诲疄渚�
-    private EPlcType plcType = EPlcType.S1200; // 瑗块棬瀛怭LC绫诲瀷
-    private String ip = "127.0.0.1"; // plc ip鍦板潃
-    private int port = 21; // plc 绔彛鍙�
+    private EPlcType plcType = EPlcType.S1500; // 瑗块棬瀛怭LC绫诲瀷
+    private String ip = "192.168.10.1"; // plc ip鍦板潃
+    private int port = 102; // plc 绔彛鍙�
 
     private static volatile S7control instance = null;
 
     private S7control() {
         if (s7PLC == null)
-            s7PLC = new S7PLC(plcType, ip, port);
+            s7PLC = new S7PLC(plcType, ip, port,0,0);
     }
 
     // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
@@ -47,8 +47,10 @@
      * @param data    word鐨勫��
      */
     public void WriteWord(String address, short data) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
+        {
             return;
+        }
         s7PLC.writeInt16(address, data);
     }
 
@@ -59,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);
@@ -77,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);
 
@@ -95,7 +97,7 @@
      * @param data    Bit鐨勫��
      */
     public void WriteBit(String address, Boolean data) {
-        if (!s7PLC.checkConnected())
+        if (s7PLC==null)
             return;
         s7PLC.writeBoolean(address, data);
     }
@@ -107,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);
 
@@ -125,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);
@@ -143,8 +145,8 @@
      * @return 缁撴灉
      */
     public List<Short> ReadWord(List<String> address) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+              return null;
         return s7PLC.readInt16(address);
     }
 
@@ -156,8 +158,8 @@
      * @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);
@@ -170,8 +172,8 @@
      * @return Boolean缁撴灉
      */
     public List<Boolean> ReadBits(List<String> addresslist) {
-        if (!s7PLC.checkConnected())
-            return null;
+        if (s7PLC==null)
+             return null;
         return s7PLC.readBoolean(addresslist);
     }
 
@@ -183,16 +185,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;
@@ -204,7 +206,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) {
@@ -212,7 +215,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