From ad1cb1a11e642ce600d8480b8d3aa6a27f6732f9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 14 Dec 2022 14:06:35 +0800
Subject: [PATCH] 国控站数据维护问题
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 12ec221..5287e1c 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -2,10 +2,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.CityAqi;
import com.moral.api.entity.GovMonitorPoint;
import com.moral.api.entity.HistoryAqi;
-import com.moral.api.mapper.CityAqiMapper;
import com.moral.api.mapper.HistoryAqiMapper;
import com.moral.api.service.GovMonitorPointService;
import com.moral.api.service.HistoryAqiService;
@@ -13,6 +11,7 @@
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
+import com.xxl.job.core.context.XxlJobHelper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,8 +46,6 @@
@Autowired
private HistoryAqiMapper historyAqiMapper;
- @Autowired
- private CityAqiMapper cityAqiMapper;
@Autowired
private RestTemplate restTemplate;
@@ -75,9 +72,10 @@
//������������������������������������������
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(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<>();
+ List<HistoryAqi> historyAqis = new ArrayList<>();
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
HistoryAqi historyAqi = new HistoryAqi();
@@ -102,7 +100,7 @@
//���������������
historyAqi.setValue(JSONObject.toJSONString(map));
-// historyAqis.add(historyAqi);
+ historyAqis.add(historyAqi);
Map<String, Object> value = new HashMap<>();
Object pm2_5 = map.get("pm2_5");
@@ -135,15 +133,12 @@
value.put(Constants.SENSOR_CODE_O3, o3);
}
+
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
- historyAqiMapper.insert(historyAqi);
- CityAqi cityAqi = new CityAqi();
- cityAqi.setCityCode(11111);
- cityAqi.setTime(DateUtils.addHours(time, -1));
- cityAqi.setValue(JSONObject.toJSONString(map));
- cityAqiMapper.insert(cityAqi);
+// historyAqiMapper.insert(historyAqi);
+
}else {
ResponseEntity<String> response;
@@ -164,7 +159,7 @@
//���������������
historyAqi.setValue(JSONObject.toJSONString(map));
-// historyAqis.add(historyAqi);
+ historyAqis.add(historyAqi);
Map<String, Object> value = new HashMap<>();
Object pm2_5 = map.get("pm2_5");
@@ -199,18 +194,16 @@
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
- historyAqiMapper.insert(historyAqi);
+// historyAqiMapper.insert(historyAqi);
- CityAqi cityAqi = new CityAqi();
- cityAqi.setCityCode(11111);
- cityAqi.setTime(DateUtils.addHours(time, -1));
- cityAqi.setValue(JSONObject.toJSONString(map));
- cityAqiMapper.insert(cityAqi);
}
}
//���������������
-// historyAqiMapper.insertHistoryAqi(historyAqis);
+ if (ObjectUtils.isEmpty(historyAqis)){
+ XxlJobHelper.log("���������������");
+ }
+ historyAqiMapper.insertHistoryAqi(historyAqis);
}
@Override
--
Gitblit v1.8.0