From 14a7c56b3a74fb06285cca18b41256a2b15e8afb Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sat, 09 Oct 2021 16:55:53 +0800
Subject: [PATCH] screen-aqi 修改监测因子对比图返回的数据结构
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 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 59a1139..b9d6c80 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
@@ -2,20 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.config.mybatis.MybatisPlusConfig;
+import com.moral.api.entity.HistoryFiveMinutely;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.service.HistoryHourlyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.constant.SeparateTableType;
import com.moral.util.AQIUtils;
import com.moral.util.DateUtils;
+import com.moral.util.MybatisPLUSUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -26,25 +28,64 @@
* @since 2021-07-14
*/
@Service
-public class HistoryHourlyServiceImpl extends ServiceImpl<HistoryHourlyMapper, HistoryHourly> implements HistoryHourlyService {
+public class HistoryHourlyServiceImpl implements HistoryHourlyService {
@Autowired
private HistoryHourlyMapper historyHourlyMapper;
@Override
public Map<String, Object> getHourlyAqiByMac(String mac) {
- QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
- String time = DateUtils.dateToDateString(new Date(), DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
- queryWrapper.eq("time", time).eq("mac", mac);
+ Date now = new Date();
+ String time = DateUtils.dateToDateString(now, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
//������������������
- HistoryHourly historyHourly = historyHourlyMapper.selectOne(queryWrapper);
+ Map<String, Object> params = new HashMap<>();
+ params.put("timeUnits", DateUtils.dateToDateString(now, DateUtils.yyyyMM_EN));
+ params.put("mac", mac);
+ params.put("time", time);
+ String value = historyHourlyMapper.selectHourlyData(params);
Map<String, Object> result = new HashMap<>();
- if (historyHourly == null) {
+ if (ObjectUtils.isEmpty(value)) {
result.put("AQI", Constants.NULL_VALUE);
return result;
}
- Map<String, Object> data = JSONObject.parseObject(historyHourly.getValue(), Map.class);
+ Map<String, Object> data = JSONObject.parseObject(value, Map.class);
result.put("AQI", AQIUtils.hourlyAqi(data));
return result;
}
+
+ /**
+ * @Description: ���������������������������mac���������
+ * @Param: [mac, startDate, endDate]
+ * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+ * @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);
+ wrapper.between("time",startDate,endDate);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
+ List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
+ return datas;
+ }
+
+ /**
+ * @Description: ������������������������������������������������wrapper���������������
+ * @Param: [wrapper, tableNames]
+ * @return: java.util.List<com.moral.api.entity.HistoryHourly>
+ * @Author: ���������
+ * @Date: 2021/9/23
+ */
+ private List<HistoryHourly> multiTableQuery(QueryWrapper<HistoryHourly> wrapper,List<String> tableNames){
+ List<HistoryHourly> result = new ArrayList<>();
+ for (String tableName : tableNames) {
+ MybatisPlusConfig.tableName.set(tableName);
+ List<HistoryHourly> datas = historyHourlyMapper.selectList(wrapper);
+ result.addAll(datas);
+ }
+ MybatisPlusConfig.tableName.remove();
+ return result;
+ }
+
}
--
Gitblit v1.8.0