From 10c5247722995e571b3fd4dbffb178964a9bd6ee Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 05 十一月 2025 10:51:54 +0800
Subject: [PATCH] 台账添加错误问题修改
---
smart-man-boot/src/main/java/com/qianwen/smartman/common/websocket/realtime/RealTimeDataJsonMessageHandler.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 b233ed2..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,8 +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;
@@ -17,21 +22,35 @@
*/
@Component
public class RealTimeDataJsonMessageHandler implements JsonMessageHandler<RealTimeDataRequestJsonWebSocketMessage> {
- private final IOrderWorkstationService orderWorkstationService;
+ private Logger log = LoggerFactory.getLogger(this.getClass());
+ //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();
- List<OrderWorkstation> workstationInProcess = this.orderWorkstationService.getWorkstationInProcess(workstationIdList.stream().map(Long::valueOf).collect(Collectors.toSet()));
- Map<Long, String> orderWorkstationMap = workstationInProcess.stream().collect(Collectors.toMap(OrderWorkstation::getWorkstationId, OrderWorkstation::getOrderCode));
+ log.info("鏀跺埌websocket娑堟伅锛宮essage.workstationidList={}",message.getWorkstationIdList());
+ //浠巄lade_order_xxx琛ㄨ幏鍙栨鍦ㄥ姞宸ョ殑宸ヤ綅锛�
+ //List<OrderWorkstation> workstationInProcess = this.orderWorkstationService.getWorkstationInProcess(workstationIdList.stream().map(Long::valueOf).collect(Collectors.toSet()));
+
+ //鐢熸垚 宸ヤ綅id -> 宸ュ崟鍙风殑map
+ //Map<Long, String> orderWorkstationMap = workstationInProcess.stream().collect(Collectors.toMap(OrderWorkstation::getWorkstationId, OrderWorkstation::getOrderCode));
+
if (Func.isNotEmpty(workstationIdList)) {
for (String workstationId : workstationIdList) {
RealTimeDaraResponseJsonWebSocketMessage jsonWebSocketMessage = new RealTimeDaraResponseJsonWebSocketMessage();
- Map<String, Object> map = WorkstationCache.getWorkstationRealTime(workstationId);
- map.put("orderCode", Func.isEmpty(orderWorkstationMap.get(Long.valueOf(workstationId))) ? "-" : orderWorkstationMap.get(Long.valueOf(workstationId)));
+ Map<String, Object> map = WorkstationCache.getWorkstationRealTime(workstationId);//TODO锛氳繖灏辨槸杩斿洖缁欏墠绔殑鏁版嵁锛屾垜闇�瑕佸湪杩欓噷鏌ヨ,閲岄潰缂撳瓨娌℃湁锛屽疄闄呬笂灏辨槸鐩存帴鏌ヨ
+ 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);
WebSocketMessageSender.send(session, jsonWebSocketMessage);
--
Gitblit v1.9.3