From 1a74c9c77b67ee5faa444e9671dcb2020e673341 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 23 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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..7752856 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() {
@@ -330,6 +338,12 @@
//缂虹墖璇︽儏
List<LackDetailsDTO> lackDetailsList = hollowGlassRelationInfoService.queryLackByFlowCard();
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)
+ .eq(ProductAlarmInfo::getAlarmCode, ALARM_CODE)));
}
@Scheduled(fixedDelay = 1000)
--
Gitblit v1.8.0