From d41ce9c4703807bf2607a74b8305c1d78aed4ec1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 22 九月 2025 13:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 328 +++++++++++++++++++++++++++---------------------------
1 files changed, 165 insertions(+), 163 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 ae03e7a..796371c 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
@@ -1,6 +1,5 @@
package com.mes.job;
-import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
@@ -11,8 +10,8 @@
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
import com.mes.common.config.Const;
import com.mes.hollow.entity.HollowBigStorageCageDetails;
-import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.entity.dto.FlowCardGlassInfoDTO;
+import com.mes.hollow.entity.dto.LackDetailsDTO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import com.mes.hollow.service.HollowBigStorageCageDetailsService;
import com.mes.hollow.service.HollowBigStorageCageService;
@@ -26,7 +25,6 @@
import com.mes.s7.entity.S7DataZKDLPOne;
import com.mes.s7.entity.S7DataZKDLPTwo;
import com.mes.s7.entity.S7DataZKExtra;
-import com.mes.tools.WebSocketServer;
import com.mes.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -42,7 +40,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* @Author : zhoush
@@ -117,21 +114,22 @@
}
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).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));
- jsonObject.append("queueInfo", list);
- }
-
+// List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+// .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START).eq(HollowGlassOutRelationInfo::getCell, cell));
+ JSONObject jsonObject = new JSONObject(true);
+// 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));
+// jsonObject.append("queueInfo", list);
+// }
+ Map<String, List<HollowGlassQueueInfo>> queueInfo = hollowGlassOutRelationInfoService.appointHollowTaskDetails(cell);
+ jsonObject.append("queueInfo", queueInfo);
try {
jsonObject.append("freeRequest", isFreeTag);
} catch (Exception e) {
log.error("opc瀛樺湪寮傚父", e);
}
- webSocketUtils.sendToWeb(websocketName,jsonObject);
+ webSocketUtils.sendToWeb(websocketName, jsonObject);
}
@Scheduled(fixedDelay = 1000)
@@ -140,7 +138,7 @@
try {
//鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
queryDataSource1(jsonObject);
- webSocketUtils.sendToWeb("hollowGlassMessage",jsonObject);
+ webSocketUtils.sendToWeb("hollowGlassMessage", jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
@@ -148,9 +146,9 @@
public void queryDataSource1(JSONObject jsonObject) throws Exception {
-// S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
-// S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
-// S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
+ S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+ S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+ S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
List<Double> carPostion = new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
@@ -158,150 +156,150 @@
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());
-// try {
-// //杩涚墖浠诲姟鏁版嵁
-// List<BigStorageTaskVO> inTaskList = new ArrayList();
-// String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
-// for (int i = 0; i < 6; i++) {
-// String requestWord = "";
-// String stateWord = "";
-// String targetSlotWord = "";
-// switch (i) {
-// case 0:
-// requestWord = s7DataZKDLPOne.getId1();
-// stateWord = s7DataZKDLPOne.getState1().toString();
-// targetSlotWord = s7DataZKDLPOne.getTo1().toString();
-// break;
-// case 1:
-// requestWord = s7DataZKDLPOne.getId2();
-// stateWord = s7DataZKDLPOne.getState2().toString();
-// targetSlotWord = s7DataZKDLPOne.getTo2().toString();
-// break;
-// case 2:
-// requestWord = s7DataZKDLPOne.getId3();
-// stateWord = s7DataZKDLPOne.getState3().toString();
-// targetSlotWord = s7DataZKDLPOne.getTo3().toString();
-// break;
-// case 3:
-// requestWord = s7DataZKDLPOne.getId4();
-// stateWord = s7DataZKDLPOne.getState4().toString();
-// targetSlotWord = s7DataZKDLPOne.getTo4().toString();
-// break;
-// case 4:
-// requestWord = s7DataZKDLPOne.getId5();
-// stateWord = s7DataZKDLPOne.getState5().toString();
-// targetSlotWord = s7DataZKDLPOne.getTo5().toString();
-// break;
-// case 5:
-// requestWord = s7DataZKDLPOne.getId6();
-// stateWord = s7DataZKDLPOne.getState6().toString();
-// targetSlotWord = s7DataZKDLPOne.getTo6().toString();
-// break;
-// }
-// if (StringUtils.isNotEmpty(requestWord)) {
-// BigStorageTaskVO task = new BigStorageTaskVO();
-// task.setGlassId(requestWord);
-// int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
-// .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
-// if (isExistCount > 0) {
-// task.setIsSame(1);
-// } else {
-// task.setIsSame(0);
-// }
-// task.setStartSlot(Integer.parseInt(fromOpcUa));
-// task.setTargetSlot(Integer.parseInt(targetSlotWord));
-// task.setTaskState(Integer.parseInt(stateWord));
-// inTaskList.add(task);
-// continue;
-// }
-// }
-// jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
-// } catch (Exception e) {
-// //todo:涓嶅仛浠诲姟澶勭悊
-// }
-// try {
-// //杩涚墖鑱旀満
-// Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
-// jsonObject.append("inkageEntity", inkageEntity);
-// //杩涚墖璇锋眰
-// String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
-// jsonObject.append("requestEntity", requestEntity);
-// //鍚姩鍛戒护
-// String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
-// jsonObject.append("mesReplyEntity", mesReplyEntity);
-// //鍑虹墖鑱旀満
-// String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
-// jsonObject.append("outInkageEntity", outInkageEntity);
-// //鍑虹墖璇锋眰
-// String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
-// jsonObject.append("outInkageEntity", outInkageEntity);
-// //930绌洪棽淇″彿
-// jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
-// //931绌洪棽淇″彿
-// jsonObject.append("freeTwoRequestEntity", s7DataZKExtra.getIsFree());
-// //932绌洪棽淇″彿
-// jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
-// } catch (Exception e) {
-// //todo:涓嶅仛浠诲姟澶勭悊
-// }
-//
-// //鍑虹墖浠诲姟鏁版嵁
-// List<BigStorageCageTask> outTaskList = new ArrayList<>();
-// for (int i = 0; i < 6; i++) {
-//
-// BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
-// String glassId = "";
-// Integer startSlot = 0;
-// Integer targetSlot = 0;
-// Integer taskState = 0;
-// switch (i) {
-// case 0:
-// glassId = s7DataZKDLPTwo.getId1();
-// startSlot = s7DataZKDLPTwo.getFrom1();
-// targetSlot = s7DataZKDLPTwo.getTo1();
-// taskState = s7DataZKDLPTwo.getState1();
-// ;
-// break;
-// case 1:
-// glassId = s7DataZKDLPTwo.getId2();
-// startSlot = s7DataZKDLPTwo.getFrom2();
-// targetSlot = s7DataZKDLPTwo.getTo2();
-// taskState = s7DataZKDLPTwo.getState2();
-// break;
-// case 2:
-// glassId = s7DataZKDLPTwo.getId3();
-// startSlot = s7DataZKDLPTwo.getFrom3();
-// targetSlot = s7DataZKDLPTwo.getTo3();
-// taskState = s7DataZKDLPTwo.getState3();
-// break;
-// case 3:
-// glassId = s7DataZKDLPTwo.getId4();
-// startSlot = s7DataZKDLPTwo.getFrom4();
-// targetSlot = s7DataZKDLPTwo.getTo4();
-// taskState = s7DataZKDLPTwo.getState4();
-// break;
-// case 4:
-// glassId = s7DataZKDLPTwo.getId5();
-// startSlot = s7DataZKDLPTwo.getFrom5();
-// targetSlot = s7DataZKDLPTwo.getTo5();
-// taskState = s7DataZKDLPTwo.getState5();
-// break;
-// case 5:
-// glassId = s7DataZKDLPTwo.getId6();
-// startSlot = s7DataZKDLPTwo.getFrom6();
-// targetSlot = s7DataZKDLPTwo.getTo6();
-// taskState = s7DataZKDLPTwo.getState6();
-// break;
-// }
-// if (StringUtils.isNotEmpty(glassId)) {
-// bigStorageCageTask.setGlassId(glassId);
-// bigStorageCageTask.setStartSlot(startSlot);
-// bigStorageCageTask.setTargetSlot(targetSlot);
-// bigStorageCageTask.setTaskState(taskState);
-// outTaskList.add(bigStorageCageTask);
-// }
-// }
-// jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
+ try {
+ //杩涚墖浠诲姟鏁版嵁
+ List<BigStorageTaskVO> inTaskList = new ArrayList();
+ String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
+ for (int i = 0; i < 6; i++) {
+ String requestWord = "";
+ String stateWord = "";
+ String targetSlotWord = "";
+ switch (i) {
+ case 0:
+ requestWord = s7DataZKDLPOne.getId1();
+ stateWord = s7DataZKDLPOne.getState1().toString();
+ targetSlotWord = s7DataZKDLPOne.getTo1().toString();
+ break;
+ case 1:
+ requestWord = s7DataZKDLPOne.getId2();
+ stateWord = s7DataZKDLPOne.getState2().toString();
+ targetSlotWord = s7DataZKDLPOne.getTo2().toString();
+ break;
+ case 2:
+ requestWord = s7DataZKDLPOne.getId3();
+ stateWord = s7DataZKDLPOne.getState3().toString();
+ targetSlotWord = s7DataZKDLPOne.getTo3().toString();
+ break;
+ case 3:
+ requestWord = s7DataZKDLPOne.getId4();
+ stateWord = s7DataZKDLPOne.getState4().toString();
+ targetSlotWord = s7DataZKDLPOne.getTo4().toString();
+ break;
+ case 4:
+ requestWord = s7DataZKDLPOne.getId5();
+ stateWord = s7DataZKDLPOne.getState5().toString();
+ targetSlotWord = s7DataZKDLPOne.getTo5().toString();
+ break;
+ case 5:
+ requestWord = s7DataZKDLPOne.getId6();
+ stateWord = s7DataZKDLPOne.getState6().toString();
+ targetSlotWord = s7DataZKDLPOne.getTo6().toString();
+ break;
+ }
+ if (StringUtils.isNotEmpty(requestWord)) {
+ BigStorageTaskVO task = new BigStorageTaskVO();
+ task.setGlassId(requestWord);
+ int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
+ .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
+ if (isExistCount > 0) {
+ task.setIsSame(1);
+ } else {
+ task.setIsSame(0);
+ }
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
+ task.setTargetSlot(Integer.parseInt(targetSlotWord));
+ task.setTaskState(Integer.parseInt(stateWord));
+ inTaskList.add(task);
+ continue;
+ }
+ }
+ jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+ } catch (Exception e) {
+ //todo:涓嶅仛浠诲姟澶勭悊
+ }
+ try {
+ //杩涚墖鑱旀満
+ Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+ jsonObject.append("inkageEntity", inkageEntity);
+ //杩涚墖璇锋眰
+ String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+ jsonObject.append("requestEntity", requestEntity);
+ //鍚姩鍛戒护
+ String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+ jsonObject.append("mesReplyEntity", mesReplyEntity);
+ //鍑虹墖鑱旀満
+ String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
+ jsonObject.append("outInkageEntity", outInkageEntity);
+ //鍑虹墖璇锋眰
+ String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
+ jsonObject.append("outInkageEntity", outInkageEntity);
+ //930绌洪棽淇″彿
+ jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
+ //931绌洪棽淇″彿
+ jsonObject.append("freeTwoRequestEntity", s7DataZKExtra.getIsFree());
+ //932绌洪棽淇″彿
+ jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
+ } catch (Exception e) {
+ //todo:涓嶅仛浠诲姟澶勭悊
+ }
+
+ //鍑虹墖浠诲姟鏁版嵁
+ List<BigStorageCageTask> outTaskList = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+
+ BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
+ String glassId = "";
+ Integer startSlot = 0;
+ Integer targetSlot = 0;
+ Integer taskState = 0;
+ switch (i) {
+ case 0:
+ glassId = s7DataZKDLPTwo.getId1();
+ startSlot = s7DataZKDLPTwo.getFrom1();
+ targetSlot = s7DataZKDLPTwo.getTo1();
+ taskState = s7DataZKDLPTwo.getState1();
+ ;
+ break;
+ case 1:
+ glassId = s7DataZKDLPTwo.getId2();
+ startSlot = s7DataZKDLPTwo.getFrom2();
+ targetSlot = s7DataZKDLPTwo.getTo2();
+ taskState = s7DataZKDLPTwo.getState2();
+ break;
+ case 2:
+ glassId = s7DataZKDLPTwo.getId3();
+ startSlot = s7DataZKDLPTwo.getFrom3();
+ targetSlot = s7DataZKDLPTwo.getTo3();
+ taskState = s7DataZKDLPTwo.getState3();
+ break;
+ case 3:
+ glassId = s7DataZKDLPTwo.getId4();
+ startSlot = s7DataZKDLPTwo.getFrom4();
+ targetSlot = s7DataZKDLPTwo.getTo4();
+ taskState = s7DataZKDLPTwo.getState4();
+ break;
+ case 4:
+ glassId = s7DataZKDLPTwo.getId5();
+ startSlot = s7DataZKDLPTwo.getFrom5();
+ targetSlot = s7DataZKDLPTwo.getTo5();
+ taskState = s7DataZKDLPTwo.getState5();
+ break;
+ case 5:
+ glassId = s7DataZKDLPTwo.getId6();
+ startSlot = s7DataZKDLPTwo.getFrom6();
+ targetSlot = s7DataZKDLPTwo.getTo6();
+ taskState = s7DataZKDLPTwo.getState6();
+ break;
+ }
+ if (StringUtils.isNotEmpty(glassId)) {
+ bigStorageCageTask.setGlassId(glassId);
+ bigStorageCageTask.setStartSlot(startSlot);
+ bigStorageCageTask.setTargetSlot(targetSlot);
+ bigStorageCageTask.setTaskState(taskState);
+ outTaskList.add(bigStorageCageTask);
+ }
+ }
+ jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
//璋冨害寮�鍏�
boolean dispatchHollowSwitch = false;
@@ -328,6 +326,10 @@
HollowBigStorageDetailsQueryVO hollowBigStorageDetailsQueryVO = new HollowBigStorageDetailsQueryVO();
List<FlowCardGlassInfoDTO> bigStorageCageUsageSummary = hollowGlassRelationInfoService.queryHollowAllFlowCardSummary(hollowBigStorageDetailsQueryVO);
jsonObject.append("bigStorageCageUsageSummary", bigStorageCageUsageSummary);
+
+ //缂虹墖璇︽儏
+ List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard();
+ jsonObject.append("lackDetailsList", lackDetailsList);
}
@Scheduled(fixedDelay = 1000)
@@ -341,6 +343,6 @@
jsonObject.append("pieChartVOS", pieChartVOS);
List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("hollowRunTimes", hollowRunTimes);
- webSocketUtils.sendToWeb("largenScreen",jsonObject);
+ webSocketUtils.sendToWeb("largenScreen", jsonObject);
}
}
--
Gitblit v1.8.0