From 96fd0da457350545a7d303ffe08c96354ec52cb5 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 18 九月 2024 16:44:18 +0800
Subject: [PATCH] 用户权限 页面一级菜单合并BUG  已修复

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java
index 2ba0640..d17fa08 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java
@@ -94,13 +94,13 @@
             log.info("褰撳墠鏃犲叡宸ヤ綔鐨勪换鍔★紝鏃犳晥姹囨姤瀹屾垚锛�");
         }
     }
-    //@Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 1000)
     public void markingTasks() {
         JSONObject jsonObject = new JSONObject();
         Machine machine=machineMapper.selectById(11L);
         List<Tasking> taskingList=taskingService.findMachineTask(machine);
         jsonObject.append("taskingList", taskingList);
-
+        jsonObject.append("machine", machine);
         ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("marking");
         if (sendwServer != null) {
             for (WebSocketServer webserver : sendwServer) {

--
Gitblit v1.8.0