From fa4d27ab5d5c9ae3a1ce84854ac318d6c03b9dae Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 15:42:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 73192ce..b79e914 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -3,8 +3,10 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import com.example.springboot.controller.HomeController;
+import com.example.springboot.mapper.HomeMapper;
import org.apache.commons.io.FileUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import com.example.springboot.service.StorageCageService;
import java.io.*;
import java.util.ArrayList;
@@ -18,6 +20,9 @@
public class PlcParameter2 extends Thread {
+ @Autowired
+ StorageCageService StorageCageService ;
+
// 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
private Configuration config;
@@ -39,7 +44,7 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
+ StorageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
// id
List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
@@ -127,7 +132,7 @@
// jsonObject.set("message", "Hello, Parameter2!");
// sendwServer.sendMessage(jsonObject.toString());
// }
- HomeController controller = new HomeController();
+// HomeController controller = new HomeController();
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -188,13 +193,13 @@
if (value) {
switch (i) {
case 1:
- controller.UpdateTask(0, 0, paramlist.get(i));
+ StorageCageService.UpdateTask(0, 0, paramlist.get(i));
break;
case 2:
case 3:
case 4:
case 5:
- controller.UpdateTask(1, 0, paramlist.get(i));
+ StorageCageService.UpdateTask(1, 0, paramlist.get(i));
break;
default:
// 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -256,11 +261,11 @@
boolean Value2 = sValue.get(1);
if (Value1) {
- controller.EndTask(0);
+ StorageCageService.EndTask(0);
}
if (Value2) {
- controller.EndTask(0);
+ StorageCageService.EndTask(0);
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
--
Gitblit v1.8.0