From a4bcc1576c21046167cdea4049821e2238757784 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Sat, 18 Sep 2021 09:45:59 +0800
Subject: [PATCH] screen-manage 修改添加父菜单BUG
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 b64554c..58b84a5 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
@@ -1,17 +1,15 @@
package com.moral.api.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.util.AQIUtils;
import com.moral.util.DateUtils;
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;
@@ -26,24 +24,27 @@
* @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("mac", mac).eq("time", time);
+ 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;
}
--
Gitblit v1.8.0