From 81d31a0f9449943dcd78c1d0358443366a998201 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 11 Oct 2021 17:30:10 +0800
Subject: [PATCH] 接入城市气象数据定时任务

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 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..7f337ff 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
@@ -2,11 +2,9 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.CityAqiConfig;
 import com.moral.api.entity.GovMonitorPoint;
 import com.moral.api.entity.HistoryAqi;
 import com.moral.api.mapper.HistoryAqiMapper;
-import com.moral.api.service.CityAqiConfigService;
 import com.moral.api.service.GovMonitorPointService;
 import com.moral.api.service.HistoryAqiService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,6 +22,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 +86,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