From 17d23216d139c20ba4615bcd7731776520e5b5dc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 九月 2025 16:01:36 +0800
Subject: [PATCH] 1、这块代码取消注释，添加破损查询条件
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 98 +++++++++++-------------------------------------
1 files changed, 23 insertions(+), 75 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 295d383..a6c8bbf 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;
@@ -28,8 +27,10 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
@@ -91,6 +92,8 @@
ModbusTcp CMJ2ModbusTcp;
private Integer offset = 40001;
+ @Resource
+ private WebSocketUtils webSocketUtils;
@Resource
RedisUtil redisUtil;
@@ -124,20 +127,11 @@
}
try {
-// ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa(isFreeTag);
jsonObject.append("freeRequest", isFreeTag);
} 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 +140,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();
}
@@ -182,12 +161,8 @@
try {
//杩涚墖浠诲姟鏁版嵁
List<BigStorageTaskVO> inTaskList = new ArrayList();
-// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
for (int i = 0; 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);
String requestWord = "";
String stateWord = "";
String targetSlotWord = "";
@@ -223,10 +198,8 @@
targetSlotWord = s7DataZKDLPOne.getTo6().toString();
break;
}
-// if (null != requestWord.getValue()) {
- if (null != requestWord) {
+ if (StringUtils.isNotEmpty(requestWord)) {
BigStorageTaskVO task = new BigStorageTaskVO();
-// task.setGlassId(requestWord.getValue() + "");
task.setGlassId(requestWord);
int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
@@ -235,9 +208,6 @@
} else {
task.setIsSame(0);
}
-// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
-// task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
-// task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
task.setStartSlot(Integer.parseInt(fromOpcUa));
task.setTargetSlot(Integer.parseInt(targetSlotWord));
task.setTaskState(Integer.parseInt(stateWord));
@@ -251,49 +221,31 @@
}
try {
//杩涚墖鑱旀満
-// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
-// jsonObject.append("inkageEntity", inkageEntity.getValue());
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
jsonObject.append("inkageEntity", inkageEntity);
//杩涚墖璇锋眰
-// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2A.DLP2A.RequestMes");
-// jsonObject.append("requestEntity", requestEntity.getValue());
String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
jsonObject.append("requestEntity", requestEntity);
//鍚姩鍛戒护
-// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP2A.DLP2A.MesReply");
-// jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
jsonObject.append("mesReplyEntity", mesReplyEntity);
//鍑虹墖鑱旀満
-// ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
-// jsonObject.append("outInkageEntity", outInkageEntity.getValue());
String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
jsonObject.append("outInkageEntity", outInkageEntity);
//鍑虹墖璇锋眰
-// ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
-// jsonObject.append("outRequestEntity", outRequestEntity.getValue());
String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
jsonObject.append("outInkageEntity", outInkageEntity);
//930绌洪棽淇″彿
-// ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
-// jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
//931绌洪棽淇″彿
-// ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
-// jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
jsonObject.append("freeTwoRequestEntity", s7DataZKExtra.getIsFree());
//932绌洪棽淇″彿
-// ReadWriteEntity freeThreeRequestEntity = miloService.readFromOpcUa("ZKQ3.ZKQ3.isFree");
-// jsonObject.append("freeThreeRequestEntity", freeThreeRequestEntity.getValue());
jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
} catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
}
//鍑虹墖浠诲姟鏁版嵁
-// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_two_task");
-// jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
List<BigStorageCageTask> outTaskList = new ArrayList<>();
for (int i = 0; i < 6; i++) {
@@ -341,11 +293,13 @@
taskState = s7DataZKDLPTwo.getState6();
break;
}
- 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);
@@ -357,6 +311,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();
@@ -379,20 +341,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