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/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 117 ++++++++++++++++++++--------------------------------------
1 files changed, 40 insertions(+), 77 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 0c0e2de..afdff47 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
@@ -1,27 +1,20 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
-import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
-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.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-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;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -44,11 +37,14 @@
@Autowired
private GlassInfoService glassInfoService;
- @Value("${mes.scan.ip}")
- private String scanIp;
+ @Resource
+ private WebSocketUtils webSocketUtils;
- @Value("${mes.scan.port}")
- private Integer scanPort;
+// @Value("${mes.scan.ip}")
+// private String scanIp;
+//
+// @Value("${mes.scan.port}")
+// private Integer scanPort;
private JSONObject jsonObject = new JSONObject();
@@ -126,37 +122,13 @@
queryDataSource1();
//鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
queryDataSource2();
- 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");
- }
- }
- }
- }catch (Exception e){
- e.printStackTrace(); // 鎵撳嵃鍫嗘爤淇℃伅锛屾柟渚垮畾浣嶉棶棰�
- System.out.println("webserver鍑虹幇寮傚父: " + e.getMessage());
- // TODO: handle exception
- }
-
-
-
-
+ webSocketUtils.sendToWeb("slicecage", jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
}
-// @Scheduled(fixedDelay = 1000)
+ // @Scheduled(fixedDelay = 1000)
public void temperingIsRun() {
JSONObject jsonObject = new JSONObject();
//杩涚墖浠诲姟鏁版嵁
@@ -165,46 +137,37 @@
//鍑虹墖浠诲姟鏁版嵁
List<BigStorageCageDetails> bigStorageCageDetailsOutTask = bigStorageCageDetailsService.selectOutTask();
jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("Home is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("isRun", jsonObject);
}
// @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());
- }
- }
- }
+// 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