From d4330943d76408085b2f599efeb23866e0c1ceb4 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 18 十二月 2024 16:06:57 +0800
Subject: [PATCH] 设备异常告警空数据处理
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index 8def570..74d1590 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -71,6 +71,9 @@
@Autowired
private MqttUtil mqttUtil;
+ @Value(value = "${jeecg.mqtt.enable}")
+ private boolean mqttEnable;
+
public String getTemporaryToken() {
if (token == null) {
RedisUtil redisUtil = SpringContextUtils.getBean(RedisUtil.class);
@@ -480,7 +483,7 @@
}
@Override
- public Result<?> fitFultRecord(RealTimeDataVo vo) {
+ public Result<?> fitFaultRecord(RealTimeDataVo vo) {
TenantContext.setTenant(vo.getTenantid()+"");
ThreadUtil.execute(() -> {
try {
@@ -492,7 +495,7 @@
//澶勭悊缁撴潫鍚庯紝灏唕edis涓疄鏃舵暟鎹彂閫佽嚦浜戞湇鍔″櫒
Map<Object, Object> toCloudFaultMap = redisUtil.hmget(MqttConstant.MQTT_REAL_FAULT);
- if(!toCloudFaultMap.isEmpty()){
+ if(mqttEnable && !toCloudFaultMap.isEmpty()){
MqMessage< Map<Object, Object>> message = new MqMessage<>();
message.setData(toCloudFaultMap);
message.setTentId(vo.getTenantid()+"");
@@ -538,6 +541,7 @@
*/
private List<DryFaultRecord> fitFault(String fault, String orderId,Integer tenantId,String machineId,Integer faultType){
List<DryFaultRecord> result = new ArrayList<>();
+ if(StringUtils.isEmpty(fault))return result;
//鏁版嵁鏍锋湰锛�"eqp_fault": "婊氱瓛闄嶈秴鏃�-鎶ヨ,椋庢満杩囨祦鎶ヨ,婊氱瓛鍗囪秴鏃�-鎶ヨ,椋庣鍗囨姤璀�",
System.err.println((faultType == 1 ? "绫诲瀷锛氭晠闅�" : "绫诲瀷锛氭姤璀�") + DateUtils.formatDateTime()+"--"+fault);
//redis涓殑鏁呴殰
--
Gitblit v1.9.3