From db0b4745458fd22b6552912b0572a89b2af09564 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 07 九月 2023 17:12:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index 6eae7f5..5e776f9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -2,40 +2,34 @@
import java.util.List;
+import javax.websocket.Session;
+
+import com.example.springboot.mapper.AlarmMapper;
+
+import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
public class PlcHold extends Thread {
- @Override
- public void run() {
- while (this != null) {
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
+ private AlarmMapper alarmMapper;
- List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
- //鏌ヨ鏁版嵁搴�
- //鎺ㄩ�佸埌鍓嶇
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("params", new short[] { 0, 1, 2, 3, 4, 5 });
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("talkvue");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
+ List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
+ // 鏌ヨ鏁版嵁搴�
+ // 鎺ㄩ�佸埌鍓嶇
- JSONObject jsonObject2 = new JSONObject();
- jsonObject2.append("params", new short[] { 0, 3, 2, 3, 4, 5 });
- WebSocketServer sendwServer2 = WebSocketServer.sessionMap.get("action");
- if (sendwServer2 != null) {
- sendwServer2.sendMessage(jsonObject2.toString());
- }
- }
}
+ }
}
--
Gitblit v1.8.0