From dae61fa269844f76ccc9edf9eb316ef5c3dd0798 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 06 五月 2024 07:57:56 +0800
Subject: [PATCH] 根据客户需求修改复位倒计时，修改手动页面英文显示
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java | 145 +++++++++++++++++++++++++-----------------------
1 files changed, 76 insertions(+), 69 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
index 416ae25..48d123c 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcInteractionState.java
@@ -2,12 +2,13 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
+@Slf4j
public class PlcInteractionState extends Thread {
private Configuration config;
@@ -15,87 +16,93 @@
config = new Configuration("config.properties");
}
-
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
-
-
-
-
@Override
public void run() {
while (this != null) {
try {
Thread.sleep(100);
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
+ List<String> addresses = Arrays
+ .asList(config.getProperty("PlcInteractionState.MESImporttask").split(","));
+
+ List<String> arraylist = S7control.getinstance().readStringsandword(addresses);
+ // System.out.println(arraylist);
+ List<String> addresses2 = Arrays
+ .asList(config.getProperty("PlcInteractionState.PLCImporttask").split(","));
+
+ List<String> arraylist2 = S7control.getinstance().readStringsandword(addresses2);
+
+ List<String> addresses3 = Arrays
+ .asList(config.getProperty("PlcInteractionState.MESProductiontask").split(","));
+
+ List<String> arraylist3 = S7control.getinstance().readStringsandword(addresses3);
+
+ List<String> addresses4 = Arrays
+ .asList(config.getProperty("PlcInteractionState.PLCProductiontask").split(","));
+
+ List<String> arraylist4 = S7control.getinstance().readStringsandword(addresses4);
+
+ List<String> addresses5 = Arrays
+ .asList(config.getProperty("PlcInteractionState.MEStaskinformation").split(","));
+ List<String> arraylist5 = S7control.getinstance().readStringsandword(addresses5);
+
+ List<String> addresses6 = Arrays
+ .asList(config.getProperty("PlcInteractionState.MEStaskinformation2").split(","));
+ List<String> arraylist6 = S7control.getinstance().readStringsandword(addresses6);
+
+ // String[] values = { ".x11","x21 ","x21 ","x21 ","x21 ","x21"};
+ // List<String> arraylist = new ArrayList<>(Arrays.asList(values));
+ // String[] values2 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+ // List<String> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+ // String[] values3 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+ // List<String> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+ // String[] values4 = { ".x11 ","x21 ","x21 ","x21 "};
+ // List<String> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+ // String[] values5 = { ".x11 ","x21 ","x21 ","b02","x21 ","x21 "};
+ // List<String> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+ //
+ // String[] values6 = { "x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
+ // List<String> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+
+ JSONObject jsonObject = new JSONObject();
+ // System.out.println(arraylist6);
+ JSONArray jsonArray = new JSONArray();
+ jsonArray.put(arraylist);
+ jsonArray.put(arraylist2);
+ jsonArray.put(arraylist3);
+ jsonArray.put(arraylist4);
+ jsonArray.put(arraylist5);
+ jsonArray.put(arraylist6);
+ jsonObject.put("zuhe1", jsonArray);
+
+ // WebSocketServer sendwServer =
+ // WebSocketServer.sessionMap.get("ManualonePosition");
+ // if (sendwServer != null) {
+ // sendwServer.sendMessage(jsonObject.toString());
+ // }
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("InteractionState");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if(webserver!=null&&webserver.session.isOpen()){
+ webserver.sendMessage(jsonObject.toString());
+ }else{
+ log.info("InteractionState is closed");
+ }
+
+
+ }
+ }
} catch (InterruptedException e) {
e.printStackTrace();
}
- // this.readValue();
- // String PlcAddress = this.name;
- // Integer Plccount = this.count;
-
-
- List<String> addresses = Arrays.asList(config.getProperty("PlcInteractionState.MESImporttask").split(","));
-
- List<String> arraylist = S7control.getinstance().readStringsandword(addresses);
- // System.out.println(arraylist);
- List<String> addresses2 = Arrays.asList(config.getProperty("PlcInteractionState.PLCImporttask").split(","));
-
- List<String> arraylist2 = S7control.getinstance().readStringsandword(addresses2);
-
- List<String> addresses3 = Arrays.asList(config.getProperty("PlcInteractionState.MESProductiontask").split(","));
-
- List<String> arraylist3 = S7control.getinstance().readStringsandword(addresses3);
-
-
- List<String> addresses4 = Arrays.asList(config.getProperty("PlcInteractionState.PLCProductiontask").split(","));
-
- List<String> arraylist4 = S7control.getinstance().readStringsandword(addresses4);
-
-
- List<String> addresses5 = Arrays.asList(config.getProperty("PlcInteractionState.MEStaskinformation").split(","));
- List<String> arraylist5 = S7control.getinstance().readStringsandword(addresses5);
-
-
-// String[] values = { ".x11","x21 ","x21 ","x21 ","x21 ","x21"};
-// List<String> arraylist = new ArrayList<>(Arrays.asList(values));
-// String[] values2 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
-// List<String> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-// String[] values3 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 "};
-// List<String> arraylist3 = new ArrayList<>(Arrays.asList(values3));
-// String[] values4 = { ".x11 ","x21 ","x21 ","x21 "};
-// List<String> arraylist4 = new ArrayList<>(Arrays.asList(values4));
-// String[] values5 = { ".x11 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 ","x21 "};
-// List<String> arraylist5 = new ArrayList<>(Arrays.asList(values5));
-
-
- JSONObject jsonObject = new JSONObject();
- // System.out.println(arraylist6);
- JSONArray jsonArray = new JSONArray();
- jsonArray.put(arraylist);
- jsonArray.put(arraylist2);
- jsonArray.put(arraylist3);
- jsonArray.put(arraylist4);
- jsonArray.put(arraylist5);
- jsonObject.put("zuhe1", jsonArray);
-
-
-// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
-// if (sendwServer != null) {
-// sendwServer.sendMessage(jsonObject.toString());
-// }
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("InteractionState");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
-
-
- }
- }
}
}
}
--
Gitblit v1.8.0