From f4390f7fc1185bf87e7d2dc641ec3032a792b83b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 九月 2025 12:21:31 +0800
Subject: [PATCH] 1、中空任务新增日志
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 172 ++++++++++++++++++++++++--------------------------------
1 files changed, 74 insertions(+), 98 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 ba1d20e..9bd0cf5 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
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
-import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
@@ -27,7 +26,7 @@
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;
import org.apache.commons.lang.StringUtils;
@@ -92,6 +91,8 @@
ModbusTcp CMJ2ModbusTcp;
private Integer offset = 40001;
+ @Resource
+ private WebSocketUtils webSocketUtils;
@Resource
RedisUtil redisUtil;
@@ -129,15 +130,7 @@
} catch (Exception e) {
log.error("opc瀛樺湪寮傚父", e);
}
-
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(websocketName);
- if (CollectionUtil.isNotEmpty(sendwServer)) {
- for (WebSocketServer socketServer : sendwServer) {
- if (socketServer != null && socketServer.session.isOpen()) {
- socketServer.sendMessage(jsonObject.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb(websocketName, jsonObject);
}
@Scheduled(fixedDelay = 1000)
@@ -146,22 +139,7 @@
try {
//鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
queryDataSource1(jsonObject);
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("hollowGlassMessage");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("Home is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("hollowGlassMessage", jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
@@ -239,6 +217,7 @@
jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
} catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
+ log.info("涓┖杩涚墖浠诲姟鎺ㄩ�佹暟鎹紓甯革細{}", e.getMessage());
}
try {
//杩涚墖鑱旀満
@@ -264,66 +243,69 @@
jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
} catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
+ log.info("涓┖鐘舵�佹帹閫佹暟鎹紓甯革細{}", e.getMessage());
}
+ try {
+ //鍑虹墖浠诲姟鏁版嵁
+ List<BigStorageCageTask> outTaskList = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
- //鍑虹墖浠诲姟鏁版嵁
- 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;
+ 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);
+ }
}
- if (StringUtils.isNotEmpty(glassId)) {
- bigStorageCageTask.setGlassId(glassId);
- bigStorageCageTask.setStartSlot(startSlot);
- bigStorageCageTask.setTargetSlot(targetSlot);
- bigStorageCageTask.setTaskState(taskState);
- outTaskList.add(bigStorageCageTask);
- }
+ jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
+ }catch (Exception e){
+ log.info("涓┖鍑虹墖浠诲姟鎺ㄩ�佹暟鎹紓甯革細{}", e.getMessage());
}
- jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
-
//璋冨害寮�鍏�
boolean dispatchHollowSwitch = false;
if (redisUtil.getCacheObject("dispatchHollowSwitch") == null) {
@@ -332,6 +314,14 @@
dispatchHollowSwitch = redisUtil.getCacheObject("dispatchHollowSwitch");
}
jsonObject.append("dispatchHollowSwitch", dispatchHollowSwitch);
+ //璋冨害寮�鍏�
+ boolean priorityHollowSwitch = false;
+ if (redisUtil.getCacheObject("priorityHollowSwitch") == null) {
+ redisUtil.setCacheObject("priorityHollowSwitch", false);
+ } else {
+ priorityHollowSwitch = redisUtil.getCacheObject("priorityHollowSwitch");
+ }
+ jsonObject.append("priorityHollowSwitch", priorityHollowSwitch);
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
@@ -354,20 +344,6 @@
jsonObject.append("pieChartVOS", pieChartVOS);
List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("hollowRunTimes", hollowRunTimes);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("largenScreen is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("largenScreen", jsonObject);
}
}
--
Gitblit v1.8.0