From 5327d8da2fbeda44417a09beba29e897cc7d8951 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 02 八月 2024 14:08:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 5e73260..17b0050 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
@@ -127,6 +127,13 @@
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ if (engineering != null){
+ jsonObject.append("engineering", engineering);
+ }else {
+ jsonObject.append("engineering", "0");
+ }
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -149,7 +156,7 @@
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
-// String inkageStatus ="1";
+ //String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
@@ -162,6 +169,26 @@
}
}
}
+ @Scheduled(fixedDelay = 1000)
+ public void loadGlassIsRun() {
+ JSONObject jsonObject = new JSONObject();
+ Engineering engineering = engineeringService.selectInitiate(1);
+ if (engineering != null){
+ jsonObject.append("engineering", engineering);
+ }else {
+ jsonObject.append("engineering", "0");
+ }
+ 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");
+ }
+ }
+ }
+ }
public void overTask(String loadStatus, int state) {
--
Gitblit v1.8.0