From eae026a90011e77c1a3947021c87a2eea786d1b1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 13:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 114 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 42 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 ff4e20c..0518590 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
@@ -1,14 +1,20 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.common.S7object;
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.WebSocketServer;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.tools.WebSocketUtils;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
@@ -16,8 +22,9 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
+import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author SNG-010
@@ -34,16 +41,28 @@
private UpPattenUsageService upPattenUsageService;
@Autowired
private OptimizeProjectService optimizeProjectService;
-
+ @Autowired
+ RedisUtil redisUtil;
+ @Resource
+ private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
+ @Resource
+ private RawGlassStorageStationService rawGlassStorageStationService;
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";
+
+ @Resource
+ private WebSocketUtils webSocketUtils;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+// @Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鑱旀満鐘舵��
@@ -87,7 +106,7 @@
}
}
- @Scheduled(fixedDelay = 300)
+ // @Scheduled(fixedDelay = 300)
public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
@@ -115,51 +134,62 @@
}
}
- @Scheduled(fixedDelay = 1000)
- public void loadGlassHome() {
- JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- jsonObject.append("prioritylist", upPattenUsages);
- //宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
- 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");
- }
- }
- }
+ @Scheduled(fixedDelay = 10000)
+ public void loadOneGlass() {
+ loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
}
- @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 10000)
+ public void loadTwoGlass() {
+ loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
+ }
+
+
+ public String loadGlassChild(String redisRequest, int stationCell, String tableName, String webSocketName) {
+ try {
+ JSONObject jsonObject = new JSONObject();
+ //褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋�
+ Engineering engineering = engineeringService.getOne(new LambdaQueryWrapper<Engineering>().eq(Engineering::getStationCell, stationCell)
+ .eq(Engineering::getState, 1).last("limit 1"));
+ if (null != engineering) {
+ jsonObject.append("engineering", engineering);
+ }
+ //鑾峰彇褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囦俊鎭�
+ Engineering request = redisUtil.getCacheObject(redisRequest);
+ if (request == null) {
+ request = new Engineering();
+ request.setStationCell(stationCell);
+ }
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectLoadTask(request);
+ jsonObject.append("upPattenUsages", upPattenUsages);
+
+ //鑱旀満鐘舵��
+ LoadGlassDeviceTask LoadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+ jsonObject.append("inkageState", LoadTask.getInkageState());
+ //宸ヤ綅淇℃伅
+ List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageStationService.listRawGlassDetails();
+ List<RawGlassStorageDetails> stationList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == stationCell).collect(Collectors.toList());
+ jsonObject.append("stationList", stationList);
+
+ webSocketUtils.sendToWeb(webSocketName, jsonObject);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "success";
+ }
+
+
+ // @Scheduled(fixedDelay = 5000)
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus = plcParameterObject.getPlcParameter("MesToPlc").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) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("Home is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("loadGlass", jsonObject);
}
+
public void overTask(String loadStatus, int state) {
UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
--
Gitblit v1.8.0