From 3ed50045139eb39c6cbe860f475905b38691ad3c Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 08 九月 2023 17:10:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.150:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 48 ++++++++++--------------------------------------
1 files changed, 10 insertions(+), 38 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 b8382f2..28a4104 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
@@ -4,16 +4,21 @@
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 {
+
+ private AlarmMapper alarmMapper;
+
@Override
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -21,45 +26,12 @@
List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
-
+
+ //鍒ゆ柇杩涚墖璇锋眰
+ List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
-
- // Parameter
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("params", new short[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, });
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
-
- // Action
- // JSONObject jsonObject2 = new JSONObject();
- // jsonObject2.append("acion",
- // new short[] { 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- // 1, 1, 1, 0, 0, });
- // WebSocketServer sendwServer2 = WebSocketServer.sessionMap.get("Action");
- // if (sendwServer2 != null) {
- // sendwServer2.sendMessage(jsonObject2.toString());
- // }
-
- // Sign
- JSONObject jsonObject3 = new JSONObject();
- jsonObject3.append("sig",
- new short[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0,
- 1, });
- WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign");
- if (sendwServer3 != null) {
- sendwServer3.sendMessage(jsonObject3.toString());
- }
-
- // State
- JSONObject jsonObject4 = new JSONObject();
- jsonObject4.append("sta", new short[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, });
- WebSocketServer sendwServer4 = WebSocketServer.sessionMap.get("State");
- if (sendwServer4 != null) {
- sendwServer4.sendMessage(jsonObject4.toString());
- }
}
}
--
Gitblit v1.8.0