From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 0b867e9..3fb4640 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -19,6 +19,9 @@
import com.mes.hollow.service.HollowGlassRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
+import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
+import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -53,6 +56,8 @@
BigStorageCageTaskService bigStorageCageTaskService;
@Resource
HollowGlassRelationInfoService hollowGlassRelationInfoService;
+ @Resource
+ HollowBigStorageCageHistoryTaskService hollowBigStorageCageHistoryTaskService;
@Autowired(required = false)
MiloService miloService;
@@ -60,31 +65,40 @@
@Resource
RedisUtil redisUtil;
- @Scheduled(fixedDelay = 1000)
- public void hollowGlassTask() {
+ @Scheduled(fixedDelay = 5000)
+ public void hollowGlassTaskOne() {
+ hollowGlassTaskChild(930, "CMJ1.CMJ1.isFree", "HollowGlassOne");
+ }
+
+ @Scheduled(fixedDelay = 5000)
+ public void hollowGlassTaskTwo() {
+ hollowGlassTaskChild(931, "ZKQ2.ZKQ2.isFree", "HollowGlassTwo");
+ }
+
+ @Scheduled(fixedDelay = 5000)
+ public void hollowGlassTaskThree() {
+ //todo:鏆傛棤涓夌嚎鐨勭┖闂茬姸鎬佷俊鍙凤紝涓存椂鏍囩绌洪棽鐘舵��
+ hollowGlassTaskChild(932, "ZKQ3.ZKQ3.isFree", "HollowGlassThree");
+ }
+
+ public void hollowGlassTaskChild(int cell, String isFreeTag, String websocketName) {
List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
+ .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START).eq(HollowGlassOutRelationInfo::getCell, cell));
JSONObject jsonObject = new JSONObject();
if (CollectionUtil.isNotEmpty(taskList)) {
List<Long> taskIdList = taskList.stream().map(HollowGlassOutRelationInfo::getId).collect(Collectors.toList());
List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getRelationId, taskIdList));
- Map<Integer, List<HollowGlassQueueInfo>> listMap = list.stream().collect(Collectors.groupingBy(HollowGlassQueueInfo::getCell));
- jsonObject.append("930", listMap.get(930));
- jsonObject.append("931", listMap.get(931));
- jsonObject.append("932", listMap.get(932));
+ jsonObject.append("queueInfo", list);
}
try {
//930绌洪棽淇″彿
- ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
- jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
- //931绌洪棽淇″彿
- ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
- jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
+ ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa(isFreeTag);
+ jsonObject.append("freeRequest", freeOneRequestEntity.getValue());
} catch (Exception e) {
log.error("opc瀛樺湪寮傚父", e);
}
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(websocketName);
if (CollectionUtil.isNotEmpty(sendwServer)) {
for (WebSocketServer socketServer : sendwServer) {
if (socketServer != null && socketServer.session.isOpen()) {
@@ -181,6 +195,9 @@
//931绌洪棽淇″彿
ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
+ //932绌洪棽淇″彿
+ ReadWriteEntity freeThreeRequestEntity = miloService.readFromOpcUa("ZKQ3.ZKQ3.isFree");
+ jsonObject.append("freeThreeRequestEntity", freeThreeRequestEntity.getValue());
} catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
}
@@ -214,6 +231,11 @@
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> hollowBigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
jsonObject.append("hollowBigStorageCageUsage", hollowBigStorageCageUsage);
+ //閽㈠寲楗煎浘鏁版嵁
+ List<PieChartVO> pieChartVOS = hollowGlassOutRelationInfoService.queryPieChart();
+ jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes();
+ jsonObject.append("hollowRunTimes", hollowRunTimes);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0