From d799fbde44cc568a3e15d78dc6e582ff244ffa89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 三月 2025 16:05:44 +0800
Subject: [PATCH] 1、卧式理片重置任务调整，避免无任务情况下无法将任务交互表的数据清掉 2、中空领取任务界面新增产品名称，便于识别产品 3、调整部分定时任务间隔时间 4、定时任务分隔开，按照两个/多个界面的websocket由一个分为多个 5、取消钢化功能开发中z
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 96 ++++++++++++++++++++---------------------------
1 files changed, 41 insertions(+), 55 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 24d9513..dbf0966 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,6 +1,7 @@
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;
@@ -8,6 +9,8 @@
import com.mes.opctask.entity.LoadGlassDeviceTask;
import com.mes.opctask.service.LoadGlassDeviceTaskService;
import com.mes.pp.service.OptimizeProjectService;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -24,6 +27,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author SNG-010
@@ -44,6 +48,8 @@
RedisUtil redisUtil;
@Resource
private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
+ @Resource
+ private RawGlassStorageStationService rawGlassStorageStationService;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@@ -100,7 +106,7 @@
}
}
-// @Scheduled(fixedDelay = 300)
+ // @Scheduled(fixedDelay = 300)
public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
@@ -128,49 +134,48 @@
}
}
- @Scheduled(fixedDelay = 1000)
- public void loadGlassHome() {
+ @Scheduled(fixedDelay = 10000)
+ public void loadOneGlass() {
+ loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
+ }
+
+ @Scheduled(fixedDelay = 10)
+ public void loadTwoGlass() {
+ loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
+ }
+
+
+ private void loadGlassChild(String redisRequest, int stationCell, String tableName, String webSocketName) {
try {
JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- if(upPattenUsages!=null){
- jsonObject.append("prioritylist", upPattenUsages);
+ //褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋�
+ 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);
}
- //鏌ヨ1鍙风嚎鐨勪换鍔�
- Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ //鑾峰彇褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囦俊鎭�
+ Engineering request = redisUtil.getCacheObject(redisRequest);
if (request == null) {
request = new Engineering();
- request.setStationCell(5);
+ request.setStationCell(stationCell);
}
- 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);
-// 鏌ヨ宸ヤ綅浠诲姟
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectLoadTask(request);
+ jsonObject.append("upPattenUsages", upPattenUsages);
+
//鑱旀満鐘舵��
- 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());
-
+ LoadGlassDeviceTask LoadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+ jsonObject.append("inkageState", LoadTask.getInkageState());
//宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
+ List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageStationService.listRawGlassDetails();
+ List<RawGlassStorageDetails> stationList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == stationCell).collect(Collectors.toList());
+ jsonObject.append("stationList", stationList);
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
-// }
} else {
log.info("loadGlass is closed");
}
@@ -179,10 +184,9 @@
} catch (Exception e) {
e.printStackTrace();
}
-
}
- @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 216000000)
public void send() {
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mainMes");
if (sendwServer != null) {
@@ -200,13 +204,14 @@
}
}
-// @Scheduled(fixedDelay = 5000)
+ // @Scheduled(fixedDelay = 5000)
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
+ 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) {
@@ -218,26 +223,7 @@
}
}
}
- @Scheduled(fixedDelay = 1000)
- public void loadGlassIsRun() {
- JSONObject jsonObject = new JSONObject();
- //鏄惁寮�濮嬪伐绋�
- Engineering engineering = engineeringService.selectInitiate(1);
- 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) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("loadGlassIsRun is closed");
- }
- }
- }
- }
+
public void overTask(String loadStatus, int state) {
--
Gitblit v1.8.0