From a827480e5e74cb6550c5f7b842bccac3023c5bdc Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 24 Mar 2022 08:48:37 +0800
Subject: [PATCH] screen-api
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
index d4e3b4b..2ce3389 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.moral.api.entity.CityAqiDaily;
import com.moral.api.entity.CityAqiMonthly;
import com.moral.api.mapper.CityAqiMonthlyMapper;
@@ -57,6 +58,20 @@
//���������������������1���
Date end = DateUtils.addMonths(start, 1);
+ //���������1������������������������������������
+ //������1���������������������������������������������������������
+ int day = DateUtils.getDay(new Date());
+ UpdateWrapper<CityAqiMonthly> cityAqiMonthlyUpdateWrapper = new UpdateWrapper<>();
+ if (day == 1) {
+ cityAqiMonthlyUpdateWrapper.eq("time", start);
+ } else {
+ start = end;
+ end = DateUtils.addMonths(start, 1);
+ lastLastMonth = DateUtils.addMonths(start, -1);
+ cityAqiMonthlyUpdateWrapper.eq("time", start);
+ }
+ cityAqiMonthlyMapper.delete(cityAqiMonthlyUpdateWrapper);
+
//������������������aqi������������
QueryWrapper<CityAqiDaily> wrapper = new QueryWrapper<>();
@@ -82,11 +97,24 @@
.collect(Collectors.groupingBy(CityAqiMonthly::getCityCode));
- CityAqiMonthly cityAqiMonthly = new CityAqiMonthly();
+ //������������������������
+ Date thisMonthOfLastYear = DateUtils.addYears(start, -1);
+ queryWrapper.clear();
+ queryWrapper.select("city_code", "value")
+ .eq("time", DateUtils.dateToDateString(thisMonthOfLastYear));
+ List<CityAqiMonthly> thisMonthOfLastYearList = cityAqiMonthlyMapper.selectList(queryWrapper);
+ Map<Integer, List<CityAqiMonthly>> thisMonthOfLastYearData = thisMonthOfLastYearList.stream()
+ .collect(Collectors.groupingBy(CityAqiMonthly::getCityCode));
+
+
+ List<CityAqiMonthly> cityAqiMonthlyList = new ArrayList<>();
+
+ Date finalStart = start;
data.forEach((cityCode, value) -> {
+ CityAqiMonthly cityAqiMonthly = new CityAqiMonthly();
Map<String, Object> jsonMap = new HashMap<>();
cityAqiMonthly.setCityCode(Integer.parseInt(cityCode));
- cityAqiMonthly.setTime(start);
+ cityAqiMonthly.setTime(finalStart);
Map<String, Object> params = new HashMap<>();
List<Map<String, Object>> temp = new ArrayList<>();
@@ -128,7 +156,7 @@
Double compositeIndex = ComprehensiveIndexUtils.dailyData(jsonMap);
jsonMap.put("compositeIndex", compositeIndex);
- //���������������������������
+ //���������������������������(������������������)
List<CityAqiMonthly> cityAqiMonthlies = lastMonthData.get(Integer.parseInt(cityCode));
if (!ObjectUtils.isEmpty(cityAqiMonthlies)) {
CityAqiMonthly monthly = cityAqiMonthlies.get(0);
@@ -138,8 +166,45 @@
String format = decimalFormat.format((compositeIndex - lastCompositeIndex) / lastCompositeIndex);
jsonMap.put("monthContrast", format);
}
+
+ //���������������������������������������������
+ List<CityAqiMonthly> thisMonthOfLastYears = thisMonthOfLastYearData.get(Integer.parseInt(cityCode));
+
+ //���������������������
+ Map<String, Object> yearOnYearValue = yearOnYearOfSensor(thisMonthOfLastYears, jsonMap);
+ if (yearOnYearValue != null) {
+ jsonMap.putAll(yearOnYearValue);
+ }
+
cityAqiMonthly.setValue(JSONObject.toJSONString(jsonMap));
- cityAqiMonthlyMapper.insert(cityAqiMonthly);
+ cityAqiMonthlyList.add(cityAqiMonthly);
});
+ cityAqiMonthlyMapper.insertCityAqiMonthly(cityAqiMonthlyList);
+ }
+
+
+ /**
+ * @param thisMonthOfLastYearData ������������������
+ * @param currentData ������������������
+ */
+ private Map<String, Object> yearOnYearOfSensor(List<CityAqiMonthly> thisMonthOfLastYearData, Map<String, Object> currentData) {
+ Map<String, Object> result = null;
+ //���������������������������
+ List<String> sensors = Arrays.asList("PM2_5", "PM10", "SO2", "NO2", "CO", "O3", "compositeIndex");
+ if (!ObjectUtils.isEmpty(thisMonthOfLastYearData)) {
+ result = new HashMap<>();
+ CityAqiMonthly monthly = thisMonthOfLastYearData.get(0);
+ Map<String, Object> map = JSONObject.parseObject(monthly.getValue(), Map.class);
+ for (String sensor : sensors) {
+ //������������������������
+ double thisMonthOfLeastYearValue = Double.parseDouble(map.get(sensor).toString());
+ //������������������
+ double currentValue = Double.parseDouble(currentData.get(sensor).toString());
+ DecimalFormat decimalFormat = new DecimalFormat("0.00%");
+ String format = decimalFormat.format((currentValue - thisMonthOfLeastYearValue) / thisMonthOfLeastYearValue);
+ result.put(sensor + "_yearOnYear", format);
+ }
+ }
+ return result;
}
}
--
Gitblit v1.8.0