From eae026a90011e77c1a3947021c87a2eea786d1b1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 13:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 53 +++++++++--------------------------------------------
1 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index dbf0966..0518590 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -11,8 +11,7 @@
import com.mes.pp.service.OptimizeProjectService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
-import com.mes.tools.DateUtil;
-import com.mes.tools.WebSocketServer;
+import com.mes.tools.WebSocketUtils;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.RedisUtil;
@@ -24,8 +23,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -56,6 +53,9 @@
private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
private static final String LOAD_GLASS_DEVICE_TWO_TASK = "load_glass_device_two_task";
+
+ @Resource
+ private WebSocketUtils webSocketUtils;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
@@ -139,13 +139,13 @@
loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
}
- @Scheduled(fixedDelay = 10)
+ @Scheduled(fixedDelay = 10000)
public void loadTwoGlass() {
loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
}
- private void loadGlassChild(String redisRequest, int stationCell, String tableName, String webSocketName) {
+ public String loadGlassChild(String redisRequest, int stationCell, String tableName, String webSocketName) {
try {
JSONObject jsonObject = new JSONObject();
//褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋�
@@ -171,38 +171,13 @@
List<RawGlassStorageDetails> stationList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == stationCell).collect(Collectors.toList());
jsonObject.append("stationList", stationList);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("loadGlass is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb(webSocketName, jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
+ return "success";
}
- @Scheduled(fixedDelay = 216000000)
- public void send() {
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mainMes");
- if (sendwServer != null) {
- //鎺ㄩ�佹湇鍔″櫒褰撳墠鏃堕棿
- JSONObject jsonObject = new JSONObject();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- jsonObject.append("globalDate", sdf.format(DateUtil.getEndDate()));
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("mainMes is closed");
- }
- }
- }
- }
// @Scheduled(fixedDelay = 5000)
public void loadGlassStatus() {
@@ -211,17 +186,7 @@
String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("loadGlass is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("loadGlass", jsonObject);
}
--
Gitblit v1.8.0