From 61cae17b15d6a7d256e25ce42f0a4ef4163fd088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 15:54:03 +0800
Subject: [PATCH] 1、删除未修改的大屏程序
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 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 17b0050..7ed5109 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
@@ -118,24 +118,22 @@
@Scheduled(fixedDelay = 1000)
public void loadGlassHome() {
JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- if(upPattenUsages!=null){
- jsonObject.append("prioritylist", upPattenUsages);
- }
- //宸ヤ綅淇℃伅
- 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) {
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
+ if (upPattenUsages != null) {
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ jsonObject.append("engineering", engineering);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
@@ -155,8 +153,8 @@
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
- //String inkageStatus ="1";
+ String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
+// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
@@ -169,16 +167,17 @@
}
}
}
+
@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");
+ jsonObject.append("engineering", engineering);
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0