From 5ec61cdaa2c1ab4dd1d58bd94afb49343332e78f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 07 三月 2025 16:56:35 +0800
Subject: [PATCH] 添加中空大理片汇总数据显示，推送服务器时间供前端使用
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 113 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 39 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 217fadc..24d9513 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
@@ -5,7 +5,10 @@
import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
+import com.mes.opctask.entity.LoadGlassDeviceTask;
+import com.mes.opctask.service.LoadGlassDeviceTaskService;
import com.mes.pp.service.OptimizeProjectService;
+import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
@@ -17,6 +20,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
@@ -37,15 +42,21 @@
private OptimizeProjectService optimizeProjectService;
@Autowired
RedisUtil redisUtil;
+ @Resource
+ private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+
+ private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
+
+ private static final String LOAD_GLASS_DEVICE_TWO_TASK = "load_glass_device_two_task";
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+// @Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鑱旀満鐘舵��
@@ -89,7 +100,7 @@
}
}
- @Scheduled(fixedDelay = 300)
+// @Scheduled(fixedDelay = 300)
public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
@@ -119,53 +130,77 @@
@Scheduled(fixedDelay = 1000)
public void loadGlassHome() {
- JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- if(upPattenUsages!=null){
- jsonObject.append("prioritylist", upPattenUsages);
- }
- //鏌ヨ1鍙风嚎鐨勪换鍔�
- Engineering request = redisUtil.getCacheObject("loadGlassRequest");
- if (request == null) {
- request = new Engineering();
- request.setStationCell(5);
- }
- List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
- jsonObject.append("loadTask1", upPattenUsages1);
- //鏌ヨ2鍙风嚎鐨勪换鍔�
- Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
- if (request2 == null) {
- request2 = new Engineering();
- request2.setStationCell(6);
- }
- List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
- jsonObject.append("loadTask2", upPattenUsages2);
- //鏌ヨ宸ヤ綅浠诲姟
-
+ try {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
+ if(upPattenUsages!=null){
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+ //鏌ヨ1鍙风嚎鐨勪换鍔�
+ Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ if (request == null) {
+ request = new Engineering();
+ request.setStationCell(5);
+ }
+ List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
+ jsonObject.append("loadTask1", upPattenUsages1);
+ //鏌ヨ2鍙风嚎鐨勪换鍔�
+ Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
+ if (request2 == null) {
+ request2 = new Engineering();
+ request2.setStationCell(6);
+ }
+ List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
+ jsonObject.append("loadTask2", upPattenUsages2);
+// 鏌ヨ宸ヤ綅浠诲姟
+ //鑱旀満鐘舵��
+ LoadGlassDeviceTask LoadOneState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_ONE_TASK);
+ LoadGlassDeviceTask LoadTwoState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_TWO_TASK);
+ jsonObject.append("LoadOneState", LoadOneState.getInkageState());
+ jsonObject.append("LoadTwoervice", LoadTwoState.getInkageState());
- //宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+// }
+ } else {
+ log.info("loadGlass is closed");
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void send() {
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mainMes");
if (sendwServer != null) {
+ //鎺ㄩ�佹湇鍔″櫒褰撳墠鏃堕棿
+ JSONObject jsonObject = new JSONObject();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ jsonObject.append("globalDate", sdf.format(DateUtil.getEndDate()));
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");
+ log.info("mainMes is closed");
}
}
}
}
- @Scheduled(fixedDelay = 5000)
+// @Scheduled(fixedDelay = 5000)
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
@@ -178,7 +213,7 @@
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
} else {
- log.info("Home is closed");
+ log.info("loadGlass is closed");
}
}
}
@@ -198,7 +233,7 @@
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
} else {
- log.info("Home is closed");
+ log.info("loadGlassIsRun is closed");
}
}
}
--
Gitblit v1.8.0