From b2f2adab687a8d5d49fcc479f4857ec303e4b9f0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Mar 2022 10:35:08 +0800
Subject: [PATCH] screen-api 判断优良天非空
---
screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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..1745e77 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<>();
@@ -81,12 +96,14 @@
Map<Integer, List<CityAqiMonthly>> lastMonthData = lastCityAqiMonthly.stream()
.collect(Collectors.groupingBy(CityAqiMonthly::getCityCode));
+ List<CityAqiMonthly> cityAqiMonthlyList = new ArrayList<>();
- CityAqiMonthly cityAqiMonthly = new CityAqiMonthly();
+ 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<>();
@@ -139,7 +156,8 @@
jsonMap.put("monthContrast", format);
}
cityAqiMonthly.setValue(JSONObject.toJSONString(jsonMap));
- cityAqiMonthlyMapper.insert(cityAqiMonthly);
+ cityAqiMonthlyList.add(cityAqiMonthly);
});
+ cityAqiMonthlyMapper.insertCityAqiMonthly(cityAqiMonthlyList);
}
}
--
Gitblit v1.8.0