From d9f7c912d27aba37f1cbadd8b9a3acb25eb10e74 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Sat, 09 Oct 2021 10:11:01 +0800
Subject: [PATCH] 修改特殊设备更显日志格式
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index 4ed255f..ff1ede5 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -172,8 +172,11 @@
Object speed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED);
Object flagDir = dataValue.get(Constants.SENSOR_CODE_WIND_DIR + "-" + Constants.MARKER_BIT_KEY);
Object flagSpeed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED + "-" + Constants.MARKER_BIT_KEY);
- if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
- continue;
+
+ if (!ObjectUtils.isEmpty(flagDir) && !ObjectUtils.isEmpty(flagSpeed)) {
+ if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
+ continue;
+ }
}
if (ObjectUtils.isEmpty(wind) || ObjectUtils.isEmpty(speed)) {
@@ -271,10 +274,6 @@
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
Object o = dataValue.get(Constants.SENSOR_CODE_CO);
- Object flag = dataValue.get(Constants.SENSOR_CODE_CO + "-" + Constants.MARKER_BIT_KEY);
- if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
- continue;
- }
if (ObjectUtils.isEmpty(o)) {
continue;
}
@@ -309,10 +308,6 @@
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
Object o = dataValue.get(Constants.SENSOR_CODE_O3);
- Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + "-" + Constants.MARKER_BIT_KEY);
- if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
- continue;
- }
if (ObjectUtils.isEmpty(o)) {
continue;
}
--
Gitblit v1.8.0