From c8d4813258b1fd1e27b109db5f4c3c89a890400c Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 24 Nov 2021 16:33:13 +0800
Subject: [PATCH] 获取地区年数据
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 5c1316e..d9a8d2f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.HistoryDaily;
import com.moral.api.mapper.HistoryDailyMapper;
import com.moral.api.service.HistoryDailyService;
@@ -11,7 +12,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -41,4 +44,40 @@
result.put("avg", data.get(params.get("sensorCode")));
return result;
}
+
+ @Override
+ public HistoryDaily getHistoryDailyByMacAndDate(String mac, Date date) {
+ QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac",mac);
+ wrapper.eq("time",date);
+ List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);
+ if(ObjectUtils.isEmpty(historyDailies))
+ return null;
+ return historyDailies.get(0);
+ }
+
+
+ @Override
+ public Map<String, HistoryDaily> getHistoryDailyByMacsAndDate(List<String> mac, Date date) {
+ QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();
+ wrapper.in("mac",mac);
+ wrapper.eq("time",date);
+ List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);
+ Map<String,HistoryDaily> map = new HashMap<>();
+ for (HistoryDaily historyDaily : historyDailies) {
+ map.put(historyDaily.getMac(),historyDaily);
+ }
+ return map;
+ }
+
+ @Override
+ public List<HistoryDaily> getHistoryDailyByMacAndTimeSlot(String mac, Date startDate, Date endDate) {
+ QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();
+ wrapper.in("mac",mac);
+ wrapper.between("time",startDate,endDate);
+ List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);
+ return historyDailies;
+ }
+
+
}
--
Gitblit v1.8.0