千灯数据转发bug修改

lizijie

2022-09-06 1b440360d4e36a6844c4e557b01da29e5d151ff2

 src/main/java/com/moral/task/AQIDataInsertTask.java

@@ -1,4 +1,5 @@
package com.moral.task;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Collection;
@@ -27,24 +28,27 @@

@Component
public class AQIDataInsertTask {

    @Resource
    private AQIService aqiService;

    @Resource
    private RedisTemplate redisTemplate;

    @XxlJob("insertData")
    public ReturnT insertData(String param){
    public ReturnT insertData(String param) {
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        RestTemplate restTemplate = new RestTemplate();
        restTemplate.getMessageConverters().add(new WxMappingJackson2HttpMessageConverter());
        Date pubtime = DateUtils.truncate(new Date(),Calendar.HOUR);
        List<Map<String,Object>> CityAqiConfigs =aqiService.getCityAqiConfig();
        Date pubtime = DateUtils.truncate(new Date(), Calendar.HOUR);
        List<Map<String, Object>> CityAqiConfigs = aqiService.getCityAqiConfig();
        ReturnT returnT = null;

        for (Map<String, Object> cityAqiConfig : CityAqiConfigs) {
            String entity = null ;
            String entity = null;
            Collection<Object> values = null;
            Map<String, Object> data = null;
            try {
         /*   try {
                HttpResponse response = HttpUtils.doGet("https://api.epmap.org", "/api/v1/air/city", "GET",
                        new HashMap<String, String>() {{put("Authorization", "APPCODE " + "31b6ea8f804a4472be3b633cfee44849");}},
                        new HashMap<String, String>() {{put("city", cityAqiConfig.get("city_name").toString());}}
@@ -65,7 +69,7 @@
                }
            } catch (Exception e) {
                e.printStackTrace();
            }
            }*/
            if (ObjectUtils.isEmpty(entity) || ObjectUtils.isEmpty(values) || values.contains("None") || pubtime == null) {
                Map<String, Object> mjMap = restTemplate.getForObject("http://sapi.7drlb.com/api/mj?cityID={1}&apiKey=aqi", Map.class, cityAqiConfig.get("city_id"));
                if (ObjectUtils.isEmpty(mjMap)) {
@@ -80,15 +84,15 @@
                }
            }
            Map<String, Object> parameters = new HashMap<>();
            parameters.put("time",pubtime);
            parameters.put("data",data.toString());
            parameters.put("code",cityAqiConfig.get("city_code"));
            parameters.put("time", pubtime);
            parameters.put("data", data.toString());
            parameters.put("code", cityAqiConfig.get("city_code"));
            if (!ObjectUtils.isEmpty(data)) {
                try {
                    int i=aqiService.insertAQIData(parameters);
                    if (i>0){
                    int i = aqiService.insertAQIData(parameters);
                    if (i > 0) {
                        returnT = new ReturnT(200, " 插入数据成功！");
                    }else {
                    } else {
                        returnT = new ReturnT(500, " 插入数据失败！");
                    }
                } catch (Exception e) {
@@ -102,11 +106,23 @@
                    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);
                    if (data.get("CITYNAME").equals("虎丘区")){
                        map.put("e1", data.get("PM2_5").toString());
                    }
                    redisTemplate.opsForHash().putAll("aqi_" + cityAqiConfig.get("city_code"), map);
                }
            }
        }
        return returnT;
    }

    @XxlJob("insertStationData")
    public ReturnT insertStationData(String param) {
        int state = aqiService.insertStationData();
        if (state == 200) {
            return new ReturnT(200, "插入成功");
        } else {
            return new ReturnT(500, "无国控数据，插入失败，请查看接口");
        }
    }
}