From 184ae3b061765e8fbe54bcef06b67c6b4f2e024c Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 九月 2023 09:52:40 +0800
Subject: [PATCH] 拉取新版本
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 f4daa38..f007033 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
@@ -6,7 +6,9 @@
import javax.websocket.Session;
import com.example.springboot.controller.SpianController;
+import com.example.springboot.service.SpianService;
import com.example.springboot.mapper.AlarmMapper;
+import com.example.springboot.mapper.HomeMapper;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -15,8 +17,11 @@
private AlarmMapper alarmMapper;
+ private SpianService spianService;
+
@Override
public void run() {
+
while (this != null) {
try {
@@ -44,20 +49,20 @@
if(exist=true){
//褰撹繘鐗囪溅绌洪棽鏃�
if(exist=true){
- List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+ //List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
+ List<Short> datas1ListID=new ArrayList<>();
+ datas1ListID.add((short)001);
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
//鑾峰彇鐜荤拑id
- for(Short list1:datas1ListID)
- spianController.selectAll(list1);
+ for(Short list1:datas1ListID){
+ spianService.selectAll(list1);
}
//System.out.println(exist);
-
}
+ }
//鑾峰彇杩涚墖id
// List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
-
-
-
-
+
// 鏌ヨ鏁版嵁搴�
// 鎺ㄩ�佸埌鍓嶇
--
Gitblit v1.8.0