From 0c4fa637138a38e1d6fa825122ee369dbc5920e4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 14 Dec 2022 09:24:43 +0800
Subject: [PATCH] 修改sql语句问题2
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 9901531..0b4daab 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,8 +2,10 @@
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;
@@ -45,6 +47,8 @@
@Autowired
private HistoryAqiMapper historyAqiMapper;
+ @Autowired
+ private CityAqiMapper cityAqiMapper;
@Autowired
private RestTemplate restTemplate;
@@ -71,9 +75,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();
@@ -98,7 +103,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");
@@ -131,8 +136,17 @@
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);
+
}else {
ResponseEntity<String> response;
try {
@@ -152,7 +166,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");
@@ -187,11 +201,18 @@
//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.insertHistoryAqi(historyAqis);
+// historyAqiMapper.insertHistoryAqi(historyAqis);
}
@Override
--
Gitblit v1.8.0