From 71594bd2dc9201834aa533099e9e49a9b84506cd Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 12 六月 2025 15:32:25 +0800
Subject: [PATCH] 新增韩语
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 86 +++++++++++++++++++++++++++++++++++--------
1 files changed, 70 insertions(+), 16 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 7dea372..30b3a63 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
@@ -5,12 +5,13 @@
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.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.scheduling.annotation.Scheduled;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -33,6 +34,14 @@
private TemperingGlassInfoService temperingGlassInfoService;
@Resource
private RedisUtil redisUtil;
+ @Autowired
+ private GlassInfoService glassInfoService;
+
+// @Value("${mes.scan.ip}")
+// private String scanIp;
+//
+// @Value("${mes.scan.port}")
+// private Integer scanPort;
private JSONObject jsonObject = new JSONObject();
@@ -67,6 +76,14 @@
temperingSwitch = redisUtil.getCacheObject("temperingSwitch");
}
jsonObject.append("temperingSwitch", temperingSwitch);
+ //鎵撳嵃寮�鍏�
+ boolean autoPrint = false;
+ if (redisUtil.getCacheObject("autoPrint") == null) {
+ redisUtil.setCacheObject("autoPrint", false);
+ } else {
+ autoPrint = redisUtil.getCacheObject("autoPrint");
+ }
+ jsonObject.append("autoPrint", autoPrint);
//褰撳墠鎸囧畾宸ョ▼
String temperingengineerId = "";
@@ -94,7 +111,7 @@
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void plcStorageCageTask() throws InterruptedException {
jsonObject = new JSONObject();
try {
@@ -102,28 +119,35 @@
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();
}
}
- @Scheduled(fixedDelay = 1000)
+ // @Scheduled(fixedDelay = 1000)
public void temperingIsRun() {
JSONObject jsonObject = new JSONObject();
//杩涚墖浠诲姟鏁版嵁
@@ -144,4 +168,34 @@
}
}
+// @Scheduled(fixedDelay = Long.MAX_VALUE)
+// public void scanCodeTask() {
+// log.info("鎵弿浠诲姟宸插惎鍔�");
+// while (true) {
+// JSONObject jsonObject = new JSONObject();
+// try (Socket socket = new Socket(scanIp, scanPort);
+// BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()))) {
+// // 鎺ユ敹鏈嶅姟鍣ㄥ搷搴�
+// log.info("绛夊緟鎵爜涓�......");
+// String glassId = in.readLine();
+// log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", glassId);
+// List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
+// 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());
+// }
+// }
+// }
+// } catch (Exception exception) {
+// log.info("璇诲彇寮傚父锛屽師鍥犱负{}", exception.getMessage());
+// }
+// }
+// }
}
\ No newline at end of file
--
Gitblit v1.8.0