From eca8731f8626a8baf4d472de31da160e5f77abc7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 30 Dec 2021 16:56:12 +0800
Subject: [PATCH] 获取多设备公有因子，排序
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
index e16fc01..2e88c31 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiServiceImpl.java
@@ -61,7 +61,7 @@
//������������������time������������������
Date dataTime = DateUtils.addHours(time, -1);
Date start = null;
- if (DateUtils.getHour(time) >= 8) {
+ if (DateUtils.getHour(time) >= 8 || DateUtils.getHour(time) == 0) {
start = DateUtils.addHours(time, -8);
}
@@ -112,7 +112,7 @@
params.put("value", JSONObject.toJSONString(aqi));
cityAqis.add(params);
if (cityAqis.size() >= 6) {
- OptionalDouble average = cityAqis.parallelStream().flatMapToDouble(v -> {
+ OptionalDouble average = cityAqis.stream().flatMapToDouble(v -> {
Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
double o3 = Double.parseDouble(dataValue.get("O3").toString());
return DoubleStream.of(o3);
@@ -151,4 +151,12 @@
redisTemplate.opsForHash().put(RedisConstants.CITY_AQI, cityCode.toString(), aqi);
}
}
+
+ @Override
+ public List<CityAqi> getCityAqi() {
+ String time = DateUtils.getDateStringOfHour(-1, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ QueryWrapper<CityAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("time", time);
+ return cityAqiMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.8.0