From 3fb93c6ca8bd5487ac900c3434824f421e024986 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 25 Aug 2021 11:57:55 +0800 Subject: [PATCH] screen-common 修复日志工具类BUG --- 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