From 1bd93d6d748edfda1b95b692f7d4ce4f38363e32 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 13:31:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7control.java | 188 ++++++++++++++++++++++-------------------------
1 files changed, 88 insertions(+), 100 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7control.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7control.java
index 26d30b5..429a6e0 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7control.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7control.java
@@ -20,7 +20,7 @@
private S7control() {
if (s7PLC == null)
- s7PLC = new S7PLC(plcType, ip, port,0,0);
+ s7PLC = new S7PLC(plcType, ip, port, 0, 0);
}
// 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
@@ -34,14 +34,14 @@
}
return instance;
}
-
+
/**
* 鍏抽棴瑗块棬瀛恠7閫氳杩炴帴
*/
public void CloseS7client() {
if (s7PLC == null)
s7PLC.close();
- s7PLC.checkConnected();
+ s7PLC.checkConnected();
}
/**
@@ -53,13 +53,12 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓獁ord
- *
+ *
* @param address 鍦板潃
* @param data word鐨勫��
*/
public void WriteWord(String address, short data) {
- if (s7PLC==null)
- {
+ if (s7PLC == null) {
return;
}
s7PLC.writeInt16(address, data);
@@ -67,12 +66,12 @@
/**
* 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜word
- *
+ *
* @param address 鍦板潃
* @param datas word鐨勫��
*/
public void WriteWord(String address, List<Short> datas) {
- if (s7PLC==null)
+ if (s7PLC == null)
return;
// s7PLC.write(address, data);
List<String> addresslist = GetAddressList(address, datas.size(), 16);
@@ -85,36 +84,32 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜word
- *
+ *
* @param address 鍦板潃
* @param datas word鐨勫��
*/
-
-
-
-
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓狟it
- *
+ *
* @param address 鍦板潃
* @param data Bit鐨勫��
*/
public void WriteBit(String address, Boolean data) {
- if (s7PLC==null)
+ 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==null)
+ if (s7PLC == null)
return;
// s7PLC.write(address, data);
@@ -127,12 +122,12 @@
/**
* 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜bit
- *
+ *
* @param address 鍦板潃
* @param datas word鐨勫��
*/
public void WriteBit(String address, List<Boolean> datas) {
- if (s7PLC==null)
+ if (s7PLC == null)
return;
// s7PLC.write(address, data);
List<String> addresslist = GetAddressList(address, datas.size(), 1);
@@ -142,14 +137,15 @@
}
s7PLC.writeMultiData(addressWrite);
}
- /**
+
+ /**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜byte
- *
+ *
* @param address 鍦板潃
* @param datas byte鐨勫��
*/
public void WriteByte(String address, byte[] datas) {
- if (s7PLC==null)
+ if (s7PLC == null)
return;
// s7PLC.write(address, data);
s7PLC.writeByte(address, datas);
@@ -157,7 +153,7 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
- *
+ *
* @param address 鍦板潃
* @return 缁撴灉
*/
@@ -174,8 +170,6 @@
}
-
-
private int getIndexFromAddress(String address) {
// 鍙互瑙ｆ瀽鍑哄湴鍧�涓殑鏁板瓧閮ㄥ垎锛屽苟杞崲涓烘暣鏁�
@@ -190,7 +184,7 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
- *
+ *
* @param address 鍦板潃
* @param count 杩炵画璇诲灏戜釜word
* @return 缁撴灉
@@ -211,19 +205,19 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇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);
+ if (s7PLC == null)
+ return null;
+ // List<String> addresslist = GetAddressList(address, count, 16);
try {
return s7PLC.readByte(address, count);
- }catch (Exception e) {
+ } catch (Exception e) {
// 澶勭悊寮傚父
System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
return null;
@@ -238,55 +232,53 @@
* @return Boolean缁撴灉
*/
public List<Boolean> ReadBits(List<String> addresslist) {
- if (s7PLC==null)
- return null;
+ if (s7PLC == null)
+ return null;
return s7PLC.readBoolean(addresslist);
}
-//璇诲彇涓嶈繛缁湴鍧�bit
-public List<Boolean> readBits(List<String> addressList) {
- if (s7PLC == null || addressList.isEmpty()) {
- return null;
- }
- List<Boolean> values = new ArrayList<>();
- for (String address : addressList) {
- try {
- boolean value = s7PLC.readBoolean(address);
- values.add(value);
- } catch (Exception e) {
- // 澶勭悊寮傚父
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ //璇诲彇涓嶈繛缁湴鍧�bit
+ public List<Boolean> readBits(List<String> addressList) {
+ if (s7PLC == null || addressList.isEmpty()) {
+ return null;
}
- }
- return values;
-}
-
-
-//璇诲彇String
-public List<String> readStrings(List<String> addressList) {
- if (s7PLC == null) {
- return null;
- }
- List<String> result = new ArrayList<>();
- for (String address : addressList) {
- try {
- byte[] bytes = s7PLC.readByte(address, 14);
- if (bytes != null) {
- String str = new String(bytes, StandardCharsets.UTF_8);
- result.add(str);
+ List<Boolean> values = new ArrayList<>();
+ for (String address : addressList) {
+ try {
+ boolean value = s7PLC.readBoolean(address);
+ values.add(value);
+ } catch (Exception e) {
+ // 澶勭悊寮傚父
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
}
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- result.add(null);
}
+
+ return values;
}
- return result;
-}
+ //璇诲彇String
+ public List<String> readStrings(List<String> addressList) {
+ if (s7PLC == null) {
+ return null;
+ }
+ List<String> result = new ArrayList<>();
+ for (String address : addressList) {
+ try {
+ byte[] bytes = s7PLC.readByte(address, 14);
+ if (bytes != null) {
+ String str = new String(bytes, StandardCharsets.UTF_8);
+ result.add(str);
+ }
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ result.add(null);
+ }
+ }
-
+ return result;
+ }
public List<String> readStringsandword(List<String> addressList) {
@@ -320,8 +312,7 @@
}
-
-//涓嶈繛缁湴鍧�鍐欏叆Word
+ //涓嶈繛缁湴鍧�鍐欏叆Word
public void WriteWord(List<String> address, List<Short> datas) {
if (s7PLC == null)
return;
@@ -331,16 +322,15 @@
short data = datas.get(i);
if (addr.contains("-")) {
- outmesid(String.valueOf(data),addr); // 鍗曠嫭澶勭悊甯︾牬鎶樺彿鐨勫湴鍧�
+ outmesid(String.valueOf(data), addr); // 鍗曠嫭澶勭悊甯︾牬鎶樺彿鐨勫湴鍧�
} else {
s7PLC.writeInt16(addr, data); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
}
}
}
-
-
-
-//瀛楃涓插啓鍏�
+
+
+ //瀛楃涓插啓鍏�
public void outmesid(String data, String addr) {
// System.out.println("outmesid: " + data);
List<Byte> glassidlist = new ArrayList<>();
@@ -355,7 +345,7 @@
S7control.getinstance().WriteByte(addr, bytes);
}
-//璇诲彇涓嶈繛缁瓀ord
+ //璇诲彇涓嶈繛缁瓀ord
public List<Short> readWords(List<String> addresses) {
if (s7PLC == null) {
return null;
@@ -378,17 +368,17 @@
return data;
}
-//璇诲彇鏃堕棿
-public Long readtime(String address) {
- if (s7PLC == null)
- return null;
- try {
- return s7PLC.readTime(address);
- } catch (Exception e) {
- System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
- return null;
+ //璇诲彇鏃堕棿
+ public Long readtime(String address) {
+ if (s7PLC == null)
+ return null;
+ try {
+ return s7PLC.readTime(address);
+ } catch (Exception e) {
+ System.out.println("璇诲彇 " + address + " 澶辫触锛�" + e.getMessage());
+ return null;
+ }
}
-}
public void writetime(String address, long datas) {
@@ -398,9 +388,6 @@
s7PLC.writeTime(address, datas); // 灏嗘暟鎹啓鍏ュ崟涓湴鍧�
}
-
-
-
private int extractAddressNumber(String address) {
@@ -427,14 +414,15 @@
return null;
}
- };
-
-
- public void writeString(String addr,String data) {
- s7PLC.writeString(addr,data);
}
-
-
+
+ ;
+
+
+ public void writeString(String addr, String data) {
+ s7PLC.writeString(addr, data);
+ }
+
private List<String> GetAddressList(String address, int count, int addedbit) {
List<String> addresslist = new ArrayList<String>();
@@ -452,8 +440,8 @@
} else
return null;
- addresslist.add(address);
- for (int i = 0; i < count-1; i++) {
+ addresslist.add(address);
+ for (int i = 0; i < count - 1; i++) {
int bitcurrent = bitindex + addedbit;
if (bitcurrent > 7) {
@@ -462,7 +450,7 @@
} else
bitindex = bitcurrent;
- String endstr=stringdatas.length==3?"." + bitindex:"";
+ String endstr = stringdatas.length == 3 ? "." + bitindex : "";
addresslist.add(stringdatas[0] + "." + dbwindex + endstr);
}
return addresslist;
--
Gitblit v1.8.0