From 40f616cb7b272efa6693585303cc98802827e8e1 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 11 Nov 2021 17:06:31 +0800
Subject: [PATCH] 报警信息按条件查询
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 91cf75f..e3f2037 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -9,6 +9,7 @@
import com.moral.api.service.HistoryHourlyService;
import com.moral.constant.Constants;
import com.moral.constant.SeparateTableType;
+import com.moral.pojo.AQI;
import com.moral.util.AQIUtils;
import com.moral.util.DateUtils;
@@ -49,7 +50,8 @@
return result;
}
Map<String, Object> data = JSONObject.parseObject(value, Map.class);
- result.put("AQI", AQIUtils.hourlyAqi(data));
+ AQI aqi = AQIUtils.hourlyAQI(data);
+ result.put("AQI", aqi.getAQIValue());
return result;
}
@@ -60,6 +62,7 @@
* @Author: ���������
* @Date: 2021/9/23
*/
+ @Override
public List<HistoryHourly> getValueByMacAndTime(String mac,Date startDate,Date endDate){
QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
wrapper.eq("mac",mac);
--
Gitblit v1.8.0