From cf4622df137c26d238730316651f214fd29ca65f Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 25 七月 2025 16:38:13 +0800
Subject: [PATCH] 修改最新websocket
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
index 073b79d..b882c87 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
@@ -2,24 +2,19 @@
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.common.S7objectFlipSlice;
-import com.mes.common.S7objectMachine;
-import com.mes.common.S7objectMarking;
-import com.mes.device.PlcParameterInfo;
-import com.mes.device.PlcParameterObject;
import com.mes.md.entity.*;
import com.mes.md.mapper.GlassInfoMapper;
import com.mes.md.mapper.MachineMapper;
import com.mes.md.mapper.TaskingMapper;
import com.mes.md.service.*;
-import com.mes.tools.WebSocketServer;
+import com.mes.websocket.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -50,6 +45,8 @@
KBBTJPDrawingBPService kBBTJPDrawingBPService;
@Autowired
LineConfigurationService lineConfigurationService;
+ @Resource
+ WebSocketServer webSocketServer;
@Autowired
private GlassInfoMapper glassInfoMapper;
public List<Map> sendRecords = new ArrayList<>();
@@ -241,33 +238,42 @@
this.webSocketServer(jsonObject);
}
-
public void webSocketServer(JSONObject jsonObject) {
try {
String sessionMapName=jsonObject.getJSONArray("sessionMapName").get(0).toString();
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(sessionMapName);
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- try {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- }catch (Exception e) {
-
- }
- } else {
- log.info("Home is closed");
- }
- }
- }
- }catch (Exception e) {
-
+ webSocketServer.sendToWeb(sessionMapName, jsonObject.toString());
+ } catch (Exception ex) {
+ log.info("{}鍙戦�佹暟鎹け璐ワ細{}", "rawGlassStorage", ex.getMessage());
}
}
+// public void webSocketServer(JSONObject jsonObject) {
+// try {
+// String sessionMapName=jsonObject.getJSONArray("sessionMapName").get(0).toString();
+// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(sessionMapName);
+// if (sendwServer != null) {
+// for (WebSocketServer webserver : sendwServer) {
+// try {
+// webserver.sendMessage(jsonObject.toString());
+// List<String> messages = webserver.getMessages();
+// if (!messages.isEmpty()) {
+// // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+// webserver.clearMessages();
+// }
+// }catch (Exception e) {
+// if (webserver != null) {
+//
+// } else {
+// log.info("Home is closed");
+// }
+// }
+//
+// }
+// }
+// }catch (Exception e) {
+//
+// }
+//
+// }
}
--
Gitblit v1.8.0