From 73fe3c5574c8fbb7b18fa9b76d53b918f6f921e1 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 12 十一月 2025 11:09:04 +0800
Subject: [PATCH] 更换前端打包方式，将ip地址配置提取到public
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 796371c..513676b 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,6 +5,8 @@
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.service.MiloService;
+import com.mes.alarm.entity.ProductAlarmInfo;
+import com.mes.alarm.service.ProductAlarmInfoService;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
@@ -67,6 +69,8 @@
@Autowired(required = false)
MiloService miloService;
+ @Resource
+ ProductAlarmInfoService productAlarmInfoService;
@Autowired
@Qualifier("s7SerializerZKDLPOne")
@@ -94,6 +98,10 @@
@Resource
RedisUtil redisUtil;
+
+ private static final String ALARM_MODULE = "涓┖";
+ private static final String ALARM_TYPE = "涓┖澶х悊鐗�";
+ private static final String ALARM_CODE = "sizeSame";
@Scheduled(fixedDelay = 5000)
public void hollowGlassTaskOne() {
@@ -222,17 +230,17 @@
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
jsonObject.append("inkageEntity", inkageEntity);
//杩涚墖璇锋眰
- String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
jsonObject.append("requestEntity", requestEntity);
//鍚姩鍛戒护
- String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+ Integer mesReplyEntity = s7DataZKDLPOne.getMesReply();
jsonObject.append("mesReplyEntity", mesReplyEntity);
//鍑虹墖鑱旀満
- String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
+ Boolean outInkageEntity = s7DataZKDLPTwo.getMesControl();
jsonObject.append("outInkageEntity", outInkageEntity);
//鍑虹墖璇锋眰
- String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
- jsonObject.append("outInkageEntity", outInkageEntity);
+ Integer outRequestEntity = s7DataZKDLPTwo.getRequestMes();
+ jsonObject.append("outRequestEntity", outRequestEntity);
//930绌洪棽淇″彿
jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
//931绌洪棽淇″彿
@@ -328,8 +336,13 @@
jsonObject.append("bigStorageCageUsageSummary", bigStorageCageUsageSummary);
//缂虹墖璇︽儏
- List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard();
+ List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryAllLackByFlowCard();
jsonObject.append("lackDetailsList", lackDetailsList);
+
+ jsonObject.append("alarmInfo", productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>()
+ .eq(ProductAlarmInfo::getState, Const.LOAD_RAW_GLASS_NEW)
+ .eq(ProductAlarmInfo::getAlarmModule, ALARM_MODULE)
+ .eq(ProductAlarmInfo::getAlarmType, ALARM_TYPE)));
}
@Scheduled(fixedDelay = 1000)
--
Gitblit v1.8.0