Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

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

@@ -77,7 +77,7 @@
    //国控站aqi数据来自阿里云市场，大中华地区空气质量API--单站点接口
    @Override
    @Transactional
    public void insertHistoryAqi() {
    public void insertHistoryAqi(String dateTime) {
        //设置请求头
        HttpHeaders headers = new HttpHeaders();
        headers.set("Authorization", "APPCODE 31b6ea8f804a4472be3b633cfee44849");
@@ -86,12 +86,16 @@

        QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
        /*//
        queryWrapper.eq("guid","d0955320-4632-4276-b9e2-959e5ace49b3");*/
        //获取所有国控，省控，县控站点
        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);
//        String timeStr = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_HH_EN);

        List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
        Date time = DateUtils.dataToTimeStampTime(DateUtils.getDate(time1, DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN);

        //String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        String timeStr = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        List<HistoryAqi> historyAqis = new ArrayList<>();

        for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
@@ -149,14 +153,8 @@
                if (!ObjectUtils.isEmpty(o3)) {
                    value.put(Constants.SENSOR_CODE_O3, o3);
                }


                //aqi数据存入redis
                redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);

//                historyAqiMapper.insert(historyAqi);


            }else {
                ResponseEntity<String> response;
                try {
@@ -175,7 +173,6 @@
                historyAqi.setTime(DateUtils.addHours(time, -1));
                //存入数据库
                historyAqi.setValue(JSONObject.toJSONString(map));

                historyAqis.add(historyAqi);

                Map<String, Object> value = new HashMap<>();
@@ -208,11 +205,8 @@
                if (!ObjectUtils.isEmpty(o3)) {
                    value.put(Constants.SENSOR_CODE_O3, o3);
                }

                //aqi数据存入redis
                redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
//                historyAqiMapper.insert(historyAqi);

            }

        }