From 959a3e15699e4547706b05f07dff190b503d2390 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 17 一月 2025 11:32:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 1695cb5..d4241db 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -67,6 +67,17 @@
jsonObject.append("930", listMap.get(930));
jsonObject.append("931", listMap.get(931));
jsonObject.append("932", listMap.get(932));
+ try {
+ //930绌洪棽淇″彿
+ ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+ jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
+ //931绌洪棽淇″彿
+ ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
+ jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
+ }catch (Exception e){
+ log.error("opc瀛樺湪寮傚父",e);
+ }
+
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
if (CollectionUtil.isNotEmpty(sendwServer)) {
for (WebSocketServer socketServer : sendwServer) {
@@ -147,6 +158,12 @@
//鍑虹墖璇锋眰
ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
jsonObject.append("outRequestEntity", outRequestEntity.getValue());
+ //930绌洪棽淇″彿
+ ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+ jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
+ //931绌洪棽淇″彿
+ ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
+ jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
}catch(Exception e){
//todo:涓嶅仛浠诲姟澶勭悊
--
Gitblit v1.8.0