From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 2 +-
1 files changed, 1 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 b64554c..59a1139 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
@@ -35,7 +35,7 @@
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);
+ queryWrapper.eq("time", time).eq("mac", mac);
//������������������
HistoryHourly historyHourly = historyHourlyMapper.selectOne(queryWrapper);
Map<String, Object> result = new HashMap<>();
--
Gitblit v1.8.0