From 5ec61cdaa2c1ab4dd1d58bd94afb49343332e78f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 07 三月 2025 16:56:35 +0800
Subject: [PATCH] 添加中空大理片汇总数据显示，推送服务器时间供前端使用
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 d4241db..5b7ba8a 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
@@ -6,12 +6,17 @@
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
+import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
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.vo.HollowBigStorageDetailsQueryVO;
import com.mes.hollow.service.HollowBigStorageCageDetailsService;
import com.mes.hollow.service.HollowBigStorageCageService;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
+import com.mes.hollow.service.HollowGlassRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
import com.mes.tools.WebSocketServer;
@@ -46,6 +51,8 @@
HollowBigStorageCageDetailsService hollowBigStorageCageDetailsService;
@Resource
BigStorageCageTaskService bigStorageCageTaskService;
+ @Resource
+ HollowGlassRelationInfoService hollowGlassRelationInfoService;
@Autowired(required = false)
MiloService miloService;
@@ -69,13 +76,13 @@
jsonObject.append("932", listMap.get(932));
try {
//930绌洪棽淇″彿
- ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+ 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);
+ } catch (Exception e) {
+ log.error("opc瀛樺湪寮傚父", e);
}
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
@@ -124,17 +131,24 @@
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());
- try{
+ try {
//杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageTask> inTaskList = new ArrayList();
+ List<BigStorageTaskVO> inTaskList = new ArrayList();
ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
for (int i = 1; i <= 6; i++) {
ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
if (null != requestWord.getValue()) {
- BigStorageCageTask task = new BigStorageCageTask();
+ BigStorageTaskVO task = new BigStorageTaskVO();
task.setGlassId(requestWord.getValue() + "");
+ int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
+ .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
+ if (isExistCount > 0) {
+ task.setIsSame(1);
+ } else {
+ task.setIsSame(0);
+ }
task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
@@ -143,6 +157,10 @@
}
}
jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+ } catch (Exception e) {
+ //todo:涓嶅仛浠诲姟澶勭悊
+ }
+ try {
//杩涚墖鑱旀満
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
jsonObject.append("inkageEntity", inkageEntity.getValue());
@@ -159,13 +177,12 @@
ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
jsonObject.append("outRequestEntity", outRequestEntity.getValue());
//930绌洪棽淇″彿
- ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+ 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){
+ } catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
}
@@ -186,16 +203,10 @@
List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
-//
-// //鎵撳嵃寮�鍏�
-// boolean autoPrint = false;
-// if (redisUtil.getCacheObject("autoPrint") == null) {
-// redisUtil.setCacheObject("autoPrint", false);
-// } else {
-// autoPrint = redisUtil.getCacheObject("autoPrint");
-// }
-// jsonObject.append("autoPrint", autoPrint);
-
+ //鐞嗙墖绗间娇鐢ㄦ儏鍐垫眹鎬�
+ HollowBigStorageDetailsQueryVO hollowBigStorageDetailsQueryVO=new HollowBigStorageDetailsQueryVO();
+ Map<String, FlowCardGlassInfoDTO> bigStorageCageUsageSummary= hollowGlassRelationInfoService.queryHollowAllFlowCardSummary(hollowBigStorageDetailsQueryVO);
+ jsonObject.append("bigStorageCageUsageSummary", bigStorageCageUsageSummary);
}
}
--
Gitblit v1.8.0