From beb40a62ce723b391964dab56de6aa0f98f50613 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 11 Mar 2022 15:08:25 +0800
Subject: [PATCH] city_aqi月,年数据定时任务修改,每日累计统计

---
 screen-job/src/main/java/com/moral/api/service/impl/CityAqiMonthlyServiceImpl.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 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 b67eebf..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<>();
@@ -83,11 +98,12 @@
 
         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<>();

--
Gitblit v1.8.0