From f69073b835f1a0c66590130e1830edcdd75ebb8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 十一月 2024 16:59:35 +0800
Subject: [PATCH] 去掉dmpvar
---
smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
index 3b2a19b..03a6888 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java
@@ -7,11 +7,13 @@
import com.qianwen.core.tool.utils.Func;
import com.qianwen.core.websocket.config.WebSocketMessageSender;
import com.qianwen.core.websocket.handler.JsonMessageHandler;
-import com.qianwen.smartman.modules.coproduction.entity.OrderWorkstation;
-import com.qianwen.smartman.modules.coproduction.service.IOrderWorkstationService;
+//import com.qianwen.smartman.modules.coproduction.entity.OrderWorkstation;
+//import com.qianwen.smartman.modules.coproduction.service.IOrderWorkstationService;
+import com.qianwen.smartman.modules.mdc.service.RealTimeDataService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.WebSocketSession;
@@ -21,11 +23,14 @@
@Component
public class RealTimeDataJsonMessageHandler implements JsonMessageHandler<RealTimeDataRequestJsonWebSocketMessage> {
private Logger log = LoggerFactory.getLogger(this.getClass());
- private final IOrderWorkstationService orderWorkstationService;
+ //private final IOrderWorkstationService orderWorkstationService;
+ @Autowired
+ private RealTimeDataService realTimeDataService;
+ /*
public RealTimeDataJsonMessageHandler(final IOrderWorkstationService orderWorkstationService) {
this.orderWorkstationService = orderWorkstationService;
- }
+ }*/
public void handle(WebSocketSession session, RealTimeDataRequestJsonWebSocketMessage message) {
List<String> workstationIdList = message.getWorkstationIdList();
@@ -43,6 +48,8 @@
if("1656819188967653378".equals(workstationId)) {
log.info(workstationId+"鏀跺埌:"+map);
}
+ long wid = Long.parseLong(workstationId);
+ realTimeDataService.addPreTimeInDeviceStatus(wid, map);
//map.put("orderCode", Func.isEmpty(orderWorkstationMap.get(Long.valueOf(workstationId))) ? "-" : orderWorkstationMap.get(Long.valueOf(workstationId)));
jsonWebSocketMessage.setData(map);
jsonWebSocketMessage.setId(workstationId);
--
Gitblit v1.9.3