From aea7379082d3a9d53a35f62e8ff435254be8d213 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 04 十一月 2025 19:46:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 85 ++++++++++--------------------------------
1 files changed, 20 insertions(+), 65 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index baa53ca..39a87d4 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -17,6 +17,7 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
+import com.mes.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -25,6 +26,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.Socket;
@@ -47,6 +49,8 @@
private DownGlassTaskService downGlassTaskService;
@Autowired
private GlassInfoService glassInfoService;
+ @Resource
+ private WebSocketUtils webSocketUtils;
@Value("${mes.scan.ip}")
private String scanIp;
@@ -65,15 +69,8 @@
List<DownWorkstation> data = downWorkstationService.list();
jsonObject.append("params", data);
log.info(jsonObject.toString());
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null && webserver.session.isOpen()) {
- log.info("宸插彂閫�");
- webserver.sendMessage(jsonObject.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb("unloadglass", jsonObject);
+
}
@Scheduled(fixedDelay = 1000)
@@ -83,14 +80,7 @@
List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1, 3);
jsonObject2.append("glassinfo", glassinfodata);
log.info(jsonObject2.toString());
- ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");
- if (sendwServer2 != null) {
- for (WebSocketServer webserver : sendwServer2) {
- if (webserver != null && webserver.session.isOpen()) {
- webserver.sendMessage(jsonObject2.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb("unloadglass2", jsonObject2);
}
@Scheduled(fixedDelay = 1000)
@@ -100,14 +90,7 @@
List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4, 6);
jsonObject3.append("glassinfo2", glassinfodata2);
log.info(jsonObject3.toString());
- ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");
- if (sendwServer3 != null) {
- for (WebSocketServer webserver : sendwServer3) {
- if (webserver != null && webserver.session.isOpen()) {
- webserver.sendMessage(jsonObject3.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb("unloadglass3", jsonObject3);
}
@Scheduled(fixedDelay = 2000)
@@ -117,14 +100,7 @@
List<Map<String, Object>> list = downStorageCageService.selectDownStorageCages();
jsonObject4.append("params2", list);
log.info(jsonObject4.toString());
- ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache");
- if (sendwServer4 != null) {
- for (WebSocketServer webserver : sendwServer4) {
- if (webserver != null && webserver.session.isOpen()) {
- webserver.sendMessage(jsonObject4.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb("downcache", jsonObject4);
}
@Scheduled(fixedDelay = 2000)
@@ -170,18 +146,11 @@
.lt("task_status", Const.UNLOAD_GLASS_DOWN)
.orderByAsc("id")
);
- if(takeGlass!=null){
+ if (takeGlass != null) {
jsonObject4.append("takeGlass", takeGlass);
}
- ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass");
- if (sendwServer4 != null) {
- for (WebSocketServer webserver : sendwServer4) {
- if (webserver != null && webserver.session.isOpen()) {
- webserver.sendMessage(jsonObject4.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb("unloadglass", jsonObject4);
}
@Scheduled(fixedDelay = 1000)
@@ -192,16 +161,8 @@
jsonObject.append("downWorkstation", downWorkstation);
List<DownGlassTask> downGlassTask = downGlassTaskService.selectOutTaskCache();
jsonObject.append("downGlassTask", downGlassTask);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unLoadGlassIsRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("unLoadGlassIsRun is closed");
- }
- }
- }
+
+ webSocketUtils.sendToWeb("unLoadGlassIsRun", jsonObject);
}
@Scheduled(fixedDelay = Long.MAX_VALUE)
@@ -215,20 +176,14 @@
log.info("绛夊緟鎵爜涓�......");
String glassId = in.readLine();
log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", glassId);
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
- if (CollectionUtils.isNotEmpty(sendwServer)) {
- //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
- GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, glassId).last("limit 1"));
- if (null == glassInfo) {
- log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", glassId);
- } else {
- for (WebSocketServer webserver : sendwServer) {
- jsonObject.append("scanGlass", glassInfo);
- webserver.sendMessage(jsonObject.toString());
- }
- }
+ //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId).last("limit 1"));
+ if (null == glassInfo) {
+ log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", glassId);
+ return;
}
+ webSocketUtils.sendToWeb("scanGlass", glassInfo);
} catch (Exception exception) {
log.info("璇诲彇寮傚父锛屽師鍥犱负{}", exception.getMessage());
}
--
Gitblit v1.8.0