From 9cb2015a78de000c9771bd8c34ffc77dce807e88 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 25 十二月 2023 14:27:13 +0800 Subject: [PATCH] 添加手动添加铝框功能,报警修改为全局报警弹出 --- springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 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 cf447b0..9d37a13 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,7 +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; @@ -12,7 +15,14 @@ import java.util.List; + + + + public class PlcParameter2 extends Thread { + @Autowired + StorageCageService StorageCageService ; + // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭� private Configuration config; @@ -34,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(",")); @@ -122,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) { @@ -177,19 +187,19 @@ } } } - +//瀹屾垚鍑虹墖 for (int i = 1; i <= 5; i++) { boolean value = sValue.get(i); if (value) { switch (i) { case 1: - HomeController.UpdateTask(0, 0, paramlist.get(i)); + StorageCageService.UpdateTask(2, 0, paramlist.get(i)); break; case 2: case 3: case 4: case 5: - HomeController.UpdateTask(1, 0, paramlist.get(i)); + StorageCageService.UpdateTask(3, 0, paramlist.get(i)); break; default: // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐� @@ -246,16 +256,16 @@ } } } - +// 缁堟杩涚墖浠诲姟 boolean Value1 = sValue.get(0); boolean Value2 = sValue.get(1); if (Value1) { - HomeController.EndTask(0); + StorageCageService.EndTask(0); } if (Value2) { - HomeController.EndTask(0); + StorageCageService.EndTask(1); } // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌� -- Gitblit v1.8.0