From d42ca2ff3ffb623224063cbec6e7d7af15460c20 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 05 十二月 2024 14:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 1f92723..0a3d658 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -6,12 +6,12 @@
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
-import com.mes.common.utils.RedisUtil;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.WebSocketServer;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -126,22 +126,31 @@
queryDataSource1();
//鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
queryDataSource2();
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
+ try {
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ } else {
+ log.info("Home is closed");
}
- } else {
- log.info("Home is closed");
}
}
+ }catch (Exception e){
+ e.printStackTrace(); // 鎵撳嵃鍫嗘爤淇℃伅锛屾柟渚垮畾浣嶉棶棰�
+ System.out.println("webserver鍑虹幇寮傚父: " + e.getMessage());
+ // TODO: handle exception
}
+
+
+
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -168,7 +177,7 @@
}
}
-// @Scheduled(fixedDelay = Long.MAX_VALUE)
+ @Scheduled(fixedDelay = Long.MAX_VALUE)
public void scanCodeTask() {
log.info("鎵弿浠诲姟宸插惎鍔�");
while (true) {
--
Gitblit v1.8.0