Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-10-18 5586964c3e63f95c9e460a6a3d85d7dca408e096

 screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java

@@ -25,6 +25,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,21 +67,26 @@
        queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
        //获取所有国控，省控，县控站点
        List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
        Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
        String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
            String guid = govMonitorPoint.getGuid();
            ResponseEntity<String> response;
            try {
                //从第三方接口获取数据
                response = restTemplate.exchange("http://chinair.market.alicloudapi.com/api/v1/air_all/station_realtime?guid={1}", HttpMethod.GET, requestEntity, String.class, guid);
                response = restTemplate.exchange("http://chinair.market.alicloudapi.com/api/v1/air_all/station_realtime?guid={1}&pubtime={2}", HttpMethod.GET, requestEntity, String.class, guid, timeStr);
            } catch (Exception e) {
                continue;
            }
            String body = response.getBody();
            Map<String, Object> data = JSONObject.parseObject(body, Map.class);
            Map<String, Object> map = (Map<String, Object>) data.get("data");
            if (ObjectUtils.isEmpty(map)) {
                continue;
            }
            HistoryAqi historyAqi = new HistoryAqi();
            historyAqi.setGuid(guid);
            historyAqi.setTime(DateUtils.getDate(map.get("pubtime").toString(), DateUtils.yyyy_MM_dd_HH_mm_ss_EN));
            historyAqi.setTime(time);
            //存入数据库
            historyAqi.setValue(JSONObject.toJSONString(map));
            historyAqiMapper.insert(historyAqi);
@@ -120,4 +126,15 @@
            redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
        }
    }

    @Override
    public HistoryAqi getHistoryApiByTimeAndGuid(String guid, String time) {
        QueryWrapper<HistoryAqi> wrapper_historyAqi = new QueryWrapper<>();
        wrapper_historyAqi.eq("guid",guid).eq("time",time);
        HistoryAqi historyAqi = new HistoryAqi();
        if (historyAqiMapper.selectCount(wrapper_historyAqi)==1){
            historyAqi = historyAqiMapper.selectOne(wrapper_historyAqi);
        }
        return historyAqi;
    }
}