From 93fe0b66e85e95e3a7e77a28504d6d289b6906b9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 08 Oct 2021 13:11:22 +0800
Subject: [PATCH] screen-manage screen-api      更改拦截器逻辑,记录token无效的请求IP以及URL。      manage记录到数据库日志中      api记录在日志文件中

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 3a8312e..73287e2 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -24,6 +24,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
@@ -87,12 +88,36 @@
             historyAqiMapper.insert(historyAqi);
 
             Map<String, Object> value = new HashMap<>();
-            value.put(Constants.SENSOR_CODE_PM25, map.get("pm2_5"));
-            value.put(Constants.SENSOR_CODE_PM10, map.get("pm10"));
-            value.put(Constants.SENSOR_CODE_SO2, map.get("so2"));
-            value.put(Constants.SENSOR_CODE_NO2, map.get("no2"));
-            value.put(Constants.SENSOR_CODE_CO, Double.parseDouble(map.get("co").toString()));
-            value.put(Constants.SENSOR_CODE_O3, map.get("o3"));
+            Object pm2_5 = map.get("pm2_5");
+            Object pm10 = map.get("pm10");
+            Object so2 = map.get("so2");
+            Object no2 = map.get("no2");
+            Object co = map.get("co");
+            Object o3 = map.get("o3");
+            if (!ObjectUtils.isEmpty(pm2_5)) {
+                value.put(Constants.SENSOR_CODE_PM25, pm2_5);
+            }
+
+            if (!ObjectUtils.isEmpty(pm10)) {
+                value.put(Constants.SENSOR_CODE_PM10, pm10);
+            }
+
+            if (!ObjectUtils.isEmpty(so2)) {
+                value.put(Constants.SENSOR_CODE_SO2, so2);
+            }
+
+            if (!ObjectUtils.isEmpty(no2)) {
+                value.put(Constants.SENSOR_CODE_NO2, no2);
+            }
+
+            if (!ObjectUtils.isEmpty(co)) {
+                value.put(Constants.SENSOR_CODE_CO, Double.parseDouble(co.toString()));
+            }
+
+            if (!ObjectUtils.isEmpty(o3)) {
+                value.put(Constants.SENSOR_CODE_O3, o3);
+            }
+
             //aqi������������redis
             redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
         }

--
Gitblit v1.8.0