From 9ae0e3d68b255dd6df31ea55d9b6eda1a61708dd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 15 一月 2025 10:13:17 +0800
Subject: [PATCH] 1、测试类报错删除 2、修改opc配置
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index e3b5d27..d4241db 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -8,13 +8,12 @@
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
import com.mes.common.config.Const;
-import com.mes.hollow.entity.HollowBigStorageCage;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
+import com.mes.hollow.service.HollowBigStorageCageDetailsService;
import com.mes.hollow.service.HollowBigStorageCageService;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -38,11 +37,13 @@
public class PushMessageToIndex {
@Resource
- HollowGlassQueueInfoService hollowGlassQueueInfoService;
+ HollowGlassQueueInfoService hollowGlassQueueInfoService;
@Resource
HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService;
@Resource
HollowBigStorageCageService hollowBigStorageCageService;
+ @Resource
+ HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
@Resource
BigStorageCageTaskService bigStorageCageTaskService;
@@ -51,20 +52,32 @@
@Resource
RedisUtil redisUtil;
+
@Scheduled(fixedDelay = 1000)
public void hollowGlassTask() {
List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START, Const.HOLLOW_FLOW_CARD_PAUSE));
+ .in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START));
if (CollectionUtil.isEmpty(taskList)) {
return;
}
JSONObject jsonObject = new JSONObject();
- List<String> flowCardIdList = taskList.stream().map(HollowGlassOutRelationInfo::getFlowCardId).collect(Collectors.toList());
- List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getFlowCardId, flowCardIdList));
+ 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));
+ 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());
+ }catch (Exception e){
+ log.error("opc瀛樺湪寮傚父",e);
+ }
+
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
if (CollectionUtil.isNotEmpty(sendwServer)) {
for (WebSocketServer socketServer : sendwServer) {
@@ -109,7 +122,7 @@
carPostion.add(0.5);
jsonObject.append("carPostion", carPostion);
//鐣岄潰灞曠ず绗煎瓙淇℃伅
- jsonObject.append("bigStorageCageInfos", hollowBigStorageCageService.queryHollowbigStorageCageDetail());
+ jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());
try{
//杩涚墖浠诲姟鏁版嵁
@@ -145,6 +158,12 @@
//鍑虹墖璇锋眰
ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
jsonObject.append("outRequestEntity", outRequestEntity.getValue());
+ //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());
}catch(Exception e){
//todo:涓嶅仛浠诲姟澶勭悊
--
Gitblit v1.8.0