From f6e042f64b3324c441c3246490b28e4acacaeb3e Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 18 九月 2024 09:12:58 +0800
Subject: [PATCH] 页面更换方法
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java
index 0d1f8c0..1e7e8a1 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java
@@ -3,7 +3,9 @@
import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
+import com.mes.md.mapper.MachineMapper;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -25,7 +27,9 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- //@Scheduled(fixedDelay = 500)
+ @Autowired
+ MachineMapper machineMapper;
+// @Scheduled(fixedDelay = 500)
public void plcEdging() {
//鏈烘鑷傝姹備俊鍙�
String request = plcParameterObject.getPlcParameter("request").getValue();
@@ -41,17 +45,20 @@
}
- //@Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void mechanicalAmWeb() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
- String warning = plcParameterObject.getPlcParameter("warning").getValue();
JSONObject jsonObject = new JSONObject();
- if (!Objects.equals(warning, "0")) {
- //log.info("鎶ヨ淇℃伅锛�"+warning);
- jsonObject.append("warning", warning);
- }
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mechanicalAmWeb");
+// String warning = plcParameterObject.getPlcParameter("warning").getValue();
+// if (!Objects.equals(warning, "0")) {
+// //log.info("鎶ヨ淇℃伅锛�"+warning);
+// jsonObject.append("warning", warning);
+// }
+ Machine machine=machineMapper.selectById(1L);
+ List<Tasking> taskingList=taskingService.findMachineTask(machine);
+ jsonObject.append("taskingList", taskingList);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mechanicalArm");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0