From 3be7bd55ff0a4ab2ed25b46cdfd1dede92300ea3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Aug 2021 11:15:29 +0800
Subject: [PATCH] kafa数据从redis获取型号，当前组织下走航车设备列表
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 797334b..a02a67f 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -163,7 +163,7 @@
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
Object sensorValue = dataValue.get(sensorCode);
//������������������������
- Object flag = dataValue.get(sensorCode + Constants.MARKER_BIT_KEY);
+ Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY);
if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
return null;
}
@@ -199,9 +199,9 @@
jsonMap.put(sensorCode, sciCal);
//���������
if (size.get() >= 45) {
- jsonMap.put(sensorCode + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
+ jsonMap.put(sensorCode + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_TRUE);
} else {
- jsonMap.put(sensorCode + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
+ jsonMap.put(sensorCode + "-" + Constants.MARKER_BIT_KEY, Constants.MARKER_BIT_FALSE);
}
}
});
--
Gitblit v1.8.0