From 728bb68f16de54040a56b5e7d7a01e4ed6c49829 Mon Sep 17 00:00:00 2001
From: yuzixiang <yzx123456>
Date: Mon, 25 May 2020 14:38:26 +0800
Subject: [PATCH] AQI数据插入任务(update)

---
 src/main/java/com/moral/task/AQIDataInsertTask.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/moral/task/AQIDataInsertTask.java b/src/main/java/com/moral/task/AQIDataInsertTask.java
index f31d5b3..71491d3 100644
--- a/src/main/java/com/moral/task/AQIDataInsertTask.java
+++ b/src/main/java/com/moral/task/AQIDataInsertTask.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.JSONObject;
 import com.moral.service.AQIService;
 import com.moral.util.HttpUtils;
-import com.moral.util.RedisUtils;
 import com.moral.util.WxMappingJackson2HttpMessageConverter;
 
 import com.xxl.job.core.biz.model.ReturnT;
@@ -11,6 +10,7 @@
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.util.EntityUtils;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
@@ -23,7 +23,7 @@
     @Resource
     private AQIService aqiService;
     @Resource
-    private RedisUtils redisUtils;
+    private RedisTemplate redisTemplate;
     @XxlJob("insertData")
     public ReturnT insertData(){
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -59,23 +59,23 @@
                 try {
                     int i=aqiService.insertAQIData(parameters);
                     if (i>0){
-                        if ("1".equals(cityAqiConfig.get("is_compensate"))) {
-                            returnT = new ReturnT(200, " ���������������������");
-                            Map<String, String> map = new HashMap<String, String>();
-                            map.put("e1", data.containsKey("PM25C") ? data.get("PM25C").toString() : data.get("PM2_5").toString());
-                            map.put("e2", data.containsKey("PM10C") ? data.get("PM10C").toString() : data.get("PM10").toString());
-                            map.put("e10", data.containsKey("COC") ? data.get("COC").toString() : data.get("CO").toString());
-                            map.put("e11", data.containsKey("SO2C") ? data.get("SO2C").toString() : data.get("SO2").toString());
-                            map.put("e15", data.containsKey("O3C") ? data.get("O3C").toString() : data.get("O3").toString());
-                            map.put("e16", data.containsKey("NO2C") ? data.get("NO2C").toString() : data.get("NO2").toString());
-                            redisUtils.set("aqi_" + cityAqiConfig.get("city_code"), map);
-                        }
+                        returnT = new ReturnT(200, " ���������������������");
                     }else {
                         returnT = new ReturnT(500, " ���������������������");
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                if ("1".equals(cityAqiConfig.get("is_compensate"))) {
+                    Map<String, String> map = new HashMap<String, String>();
+                    map.put("e1", data.containsKey("PM25C") ? data.get("PM25C").toString() : data.get("PM2_5").toString());
+                    map.put("e2", data.containsKey("PM10C") ? data.get("PM10C").toString() : data.get("PM10").toString());
+                    map.put("e10", data.containsKey("COC") ? data.get("COC").toString() : data.get("CO").toString());
+                    map.put("e11", data.containsKey("SO2C") ? data.get("SO2C").toString() : data.get("SO2").toString());
+                    map.put("e15", data.containsKey("O3C") ? data.get("O3C").toString() : data.get("O3").toString());
+                    map.put("e16", data.containsKey("NO2C") ? data.get("NO2C").toString() : data.get("NO2").toString());
+                    redisTemplate.opsForHash().putAll("aqi_" + cityAqiConfig.get("city_code"),map);
+                }
             }
         }
         return returnT;

--
Gitblit v1.8.0