From ef5dda6db97f89c09a714b9304f302c00ee4ac6c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 一月 2024 13:53: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/PlcsignReview.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java
index ef6af2d..7e9549e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcsignReview.java
@@ -32,11 +32,12 @@
}
return instance;
}
+
PlcBitObject plcBitObject = new PlcBitObject();//璇B鍖烘暟鎹疄渚�
- private void init() {
+ private void init() {
try {
- String jsonfilename= PlcsignReview.class.getResource("/JsonFile/PlcSign.json").getFile();
+ String jsonfilename = PlcsignReview.class.getResource("/JsonFile/PlcSign.json").getFile();
FileReader fileReader = new FileReader(jsonfilename);
BufferedReader bufferedReader = new BufferedReader(fileReader);
@@ -47,31 +48,31 @@
content.append(line);
}
- bufferedReader.close();
+ bufferedReader.close();
fileReader.close();
-
+
JSONObject jsonfileobj = new JSONObject(content.toString());
JSONArray jsonArray = jsonfileobj.getJSONArray("parameteInfor");
- plcBitObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
- plcBitObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
-
+ plcBitObject.setPlcAddressBegin(jsonfileobj.getStr("plcAddressBegin"));//璁剧疆璧峰浣嶅湴鍧�
+ plcBitObject.setPlcAddressLength(Integer.valueOf(jsonfileobj.getStr("plcAddressLenght")));//璁剧疆鍦板潃闀垮害
+
for (int i = 0; i < jsonArray.size(); i++) {
- JSONObject parameterObj = jsonArray.getJSONObject(i);
-
+ JSONObject parameterObj = jsonArray.getJSONObject(i);
+
PlcBitInfo plcBitInfo = new PlcBitInfo(jsonfileobj.getStr("plcAddressBegin")); //鍙傛暟瀹炰緥
- String codeid=parameterObj.getStr("codeId");
+ String codeid = parameterObj.getStr("codeId");
plcBitInfo.setCodeId(codeid);
plcBitInfo.setAddressIndex(Integer.valueOf(parameterObj.getStr("addressIndex")));
-
+
plcBitObject.addPlcBit(plcBitInfo);
- }
+ }
System.out.println("");
} catch (IOException e) {
e.printStackTrace();
}
}
-
+
@Override
public void run() {
@@ -81,7 +82,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
- List<Boolean> getplcbits=S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(),plcBitObject.getPlcAddressLength());
+ List<Boolean> getplcbits = S7control.getinstance().ReadBits(plcBitObject.getPlcAddressBegin(), plcBitObject.getPlcAddressLength());
plcBitObject.setPlcBitList(getplcbits);
// this.readValue();
// String PlcAddress = this.name;
@@ -89,7 +90,7 @@
// System.out.println(PlcAddress);
// List<Boolean> plclist = S7control.getinstance().ReadBits(PlcAddress, Plccount);
- List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
+ List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 64);
// Boolean[] values = { true, true, true, true, true, false, true, false,
// true, false, true, false, true, false,
@@ -113,11 +114,19 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.append("sig", Intlist);
- WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
- if (sendwServer3 != null) {
- sendwServer3.sendMessage(jsonObject.toString());
- }
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter1");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+
+
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ }
+ }
+
+ }
}
}
}
--
Gitblit v1.8.0