From 2a430109d582eec9fb08be388828080cdaf1b2cd Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 16:46:58 +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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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..8054729 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;
@@ -127,7 +132,7 @@
// jsonObject.set("message", "Hello, Parameter2!");
// sendwServer.sendMessage(jsonObject.toString());
// }
- 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));
+ HomeController.UpdateTask(0, 0, paramlist.get(i));
break;
case 2:
case 3:
case 4:
case 5:
- controller.UpdateTask(1, 0, paramlist.get(i));
+ HomeController.UpdateTask(1, 0, paramlist.get(i));
break;
default:
// 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -256,11 +261,11 @@
boolean Value2 = sValue.get(1);
if (Value1) {
- controller.EndTask(0);
+ HomeController.EndTask(0);
}
if (Value2) {
- controller.EndTask(0);
+ HomeController.EndTask(0);
}
// 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
--
Gitblit v1.8.0