From 2edb89372b20625cedf80821dc90b7f7ae8c310c Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 07 Aug 2020 15:39:25 +0800
Subject: [PATCH] 根据时间段获取数据
---
src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java | 7 ++
src/main/resources/mapper/DeviceMapper.xml | 6 ++
src/main/resources/mapper/HistoryDailyMapper.xml | 8 ++
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 6 ++
src/main/java/com/moral/service/DeviceService.java | 2
src/main/java/com/moral/service/HistoryDailyService.java | 2
src/main/java/com/moral/mapper/HistoryHourlyMapper.java | 1
src/main/java/com/moral/mapper/DeviceMapper.java | 2
src/main/java/com/moral/mapper/HistoryDailyMapper.java | 3 +
src/main/java/com/moral/service/HistoryHourlyService.java | 3 +
src/main/resources/mapper/HistoryHourlyMapper.xml | 8 ++
src/main/java/com/moral/controller/ScreenController.java | 113 ++++++++++++++++++++++++++++++++++---
src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java | 6 ++
13 files changed, 157 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index ca6b595..97d4bcd 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -9,16 +9,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -1995,4 +1986,106 @@
Map<String, Object> parameters = getParametersStartingWith(request, null);
weatherService.updateForecastWeather(parameters);
}
+
+ @GetMapping("dataByTimeSlot")
+ @ApiOperation(value = "������������������������������������", notes = "������������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "mac", value = "mac������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "startTime", value = "������������(���������2020-08-03/2020-08-03-13)", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "endTime", value = "������������(���������2020-08-04/2020-08-04-14)", required = true, paramType = "query", dataType = "String")})
+ public ResultBean<List<Map<String, Object>>> getDataByTimeSlot(HttpServletRequest request) throws Exception {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ String mac = parameters.get("mac").toString();
+ String startTime = parameters.get("startTime").toString();
+ String endTime = parameters.get("endTime").toString();
+ //������������������������������
+ Calendar calendar = Calendar.getInstance();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ List<Map<String, Object>> list = new ArrayList();
+ Map device = deviceService.getAllFieldByMac(parameters);
+ Map monitorPointMap = monitorPointService.selectAllById(device.get("monitor_point_id").toString());
+ Map<String, String> sensotMap = sensorService.getSensorsMap(parameters);
+ if (startTime.length()==10&&endTime.length()==10){
+ //������������������
+ Date dd = new Date();
+ //���������
+ SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd");
+ //������������������������
+ String nowTime = sim.format(dd);
+ int days = endTime.compareTo(nowTime);
+ System.out.println(days);
+ /*if (days<0){
+ Date date=null;
+ try {
+ date = new SimpleDateFormat("yy-MM-dd").parse(endTime);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ calendar.setTime(date);
+ int day=calendar.get(Calendar.DATE);
+ calendar.set(Calendar.DATE,day+1);
+
+ endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
+ }*/
+ List<Map<String, Object>> sameDayHourlyList = null;
+ if (days>=0){
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //������������������������
+ String currentTime = df.format(dd);
+ sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac,nowTime,currentTime);
+ }
+ List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac,startTime,endTime);
+ Set<String> keys = sensotMap.keySet();
+ for (String key:keys) {
+ Map<String,Object> oneSensorMap = new LinkedHashMap<>();
+ oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
+ oneSensorMap.put("deviceName",device.get("name"));
+ oneSensorMap.put("sersorKey",sensotMap.get(key));
+ for (Map<String, Object> dataMap: dataList) {
+ JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString());
+ oneSensorMap.put(dataMap.get("time").toString().substring(0,10),dataJson.getJSONArray(key).get(2));
+ }
+ Double avg = 0.0;
+ if (sameDayHourlyList != null){
+ for (Map sameDayHourlyMap:sameDayHourlyList){
+ List<Double> arr = new ArrayList<>();
+ JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString());
+ arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString()));
+ Double sum = 0.0;
+ for (int i=0;i<arr.size();i++){
+ sum += arr.get(i);
+ }
+ avg = sum / arr.size();
+ }
+ oneSensorMap.put(nowTime,avg);
+ }
+ list.add(oneSensorMap);
+ }
+ }else if (startTime.length()==13&&endTime.length()==13){
+ StringBuilder startTime_sb = new StringBuilder(startTime);
+ startTime_sb.replace(10,11," ");
+ startTime = startTime_sb.toString()+":00:00";
+ StringBuilder endTime_sb = new StringBuilder(endTime);
+ endTime_sb.replace(10,11," ");
+ endTime = endTime_sb.toString()+":00:00";
+
+ List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac,startTime,endTime);
+ Set<String> keys = sensotMap.keySet();
+ for (String key:keys) {
+ Map<String,Object> oneSensorMap = new LinkedHashMap<>();
+ oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
+ oneSensorMap.put("deviceName",device.get("name"));
+ oneSensorMap.put("sersorKey",sensotMap.get(key));
+ for (Map<String, Object> hourlyMap: hourlyList) {
+ JSONObject hourlyJson = JSONObject.parseObject(hourlyMap.get("json").toString());
+ oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),hourlyJson.getJSONArray(key).get(2));
+
+ }
+ list.add(oneSensorMap);
+ }
+ }else {
+ return null;
+ }
+ return new ResultBean<List<Map<String, Object>>>(list);
+ }
}
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index b2bd249..1daae12 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -56,4 +56,6 @@
List<Device> selectDevicesAll(Map<String, Object> params);
List<Device> getDeviceListByMonitorPointIds(List<Integer> id);
+
+ Map<String, Object> selectAllFieldByMac(Map<String, Object> params);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/mapper/HistoryDailyMapper.java b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
index c7122fd..ee8532a 100644
--- a/src/main/java/com/moral/mapper/HistoryDailyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryDailyMapper.java
@@ -1,5 +1,7 @@
package com.moral.mapper;
+import org.apache.ibatis.annotations.Param;
+
import java.util.List;
import java.util.Map;
@@ -12,4 +14,5 @@
// ���������������������������������������������
Map<String, Double> getTraceabilityData(Map<String, Object> parameters);
+ List<Map<String, Object>> getDataByTimeSlot(@Param("mac") String mac, @Param("startTime") String startTime, @Param("endTime") String endTime);
}
diff --git a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
index e968bf7..ce7ea9f 100644
--- a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
@@ -21,4 +21,5 @@
List<Map<String,Object>> getBeamByMacs(Map<String,Object> params);
+ List<Map<String, Object>> getDataByTimeSlot(@Param("mac") String mac, @Param("startTime") String startTime, @Param("endTime") String endTime);
}
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 78c2ae8..5ffb2ac 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -70,4 +70,6 @@
List<Device> getDeviceById3(int id);
List<Device> queryDevice(Map<String,Object> map);
+
+ Map<String, Object> getAllFieldByMac(Map<String, Object> parameters);
}
diff --git a/src/main/java/com/moral/service/HistoryDailyService.java b/src/main/java/com/moral/service/HistoryDailyService.java
index df13156..12c81c9 100644
--- a/src/main/java/com/moral/service/HistoryDailyService.java
+++ b/src/main/java/com/moral/service/HistoryDailyService.java
@@ -9,4 +9,6 @@
Map getOverproofData(Map<String, Object> parameters) throws Exception;
Map<String, Double> getTraceabilityData(Map<String, Object> parameters) throws Exception;
+
+ List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;
}
diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index ad011f6..2d6f9f5 100644
--- a/src/main/java/com/moral/service/HistoryHourlyService.java
+++ b/src/main/java/com/moral/service/HistoryHourlyService.java
@@ -1,5 +1,6 @@
package com.moral.service;
+import java.util.List;
import java.util.Map;
import com.moral.entity.Point;
@@ -21,4 +22,6 @@
//������historyHourly���������������
Map<String,Object> getDataByMac(String mac,String time);
+
+ List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception;
}
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index df90666..5eb9c1c 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -697,4 +697,10 @@
}
return deviceListHasWind;
}
+
+ @Override
+ public Map<String, Object> getAllFieldByMac(Map<String, Object> parameters) {
+ Map<String, Object> deviceMap = deviceMapper.selectAllFieldByMac(parameters);
+ return deviceMap;
+ }
}
diff --git a/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java
index 97cc3ad..b053761 100644
--- a/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryDailyServiceImpl.java
@@ -129,4 +129,11 @@
return resultMap;
}
+ @Override
+ public List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception {
+ List<Map<String, Object>> resultMap = historyDailyMapper.getDataByTimeSlot(mac,startTime,endTime);
+ //System.out.println(resultMap);
+ return resultMap;
+ }
+
}
diff --git a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
index bd36de4..710920a 100644
--- a/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryHourlyServiceImpl.java
@@ -115,6 +115,12 @@
}
@Override
+ public List<Map<String, Object>> getDataByTimeSlot(String mac, String startTime, String endTime) throws Exception {
+ List<Map<String, Object>> resultMap = historyHourlyMapper.getDataByTimeSlot(mac,startTime,endTime);
+ return resultMap;
+ }
+
+ @Override
public Point getDirPoint(Map<String, Object> parameters) throws Exception {
Map<String, Object> pollutionSourceData = getPollutionSourceDataByHour(parameters);
if (MapUtils.isEmpty(pollutionSourceData)) {
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 6e1dd54..a7d881e 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -485,4 +485,10 @@
select * from device where monitor_point_id in
<foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
</select>
+
+ <select id="selectAllFieldByMac" resultType="java.util.Map">
+ SELECT *
+ FROM device
+ WHERE mac = #{mac}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/HistoryDailyMapper.xml b/src/main/resources/mapper/HistoryDailyMapper.xml
index d9e25e7..4d4fe67 100644
--- a/src/main/resources/mapper/HistoryDailyMapper.xml
+++ b/src/main/resources/mapper/HistoryDailyMapper.xml
@@ -119,4 +119,12 @@
</if>
</where>
</select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getDataByTimeSlot" resultType="java.util.Map">
+ SELECT *
+ FROM history_daily
+ where mac=#{mac}
+ AND time between #{startTime} and #{endTime}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/HistoryHourlyMapper.xml b/src/main/resources/mapper/HistoryHourlyMapper.xml
index aa83d96..ad65123 100644
--- a/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -77,4 +77,12 @@
and h.json->'$.e12[0]' is not null
group by DATE_FORMAT(h.time,'%Y-%m-%d %H:%i:%s')
</select>
+
+ <!-- ������������mac������������������������������������������������������ -->
+ <select id="getDataByTimeSlot" resultType="java.util.Map">
+ SELECT *
+ FROM history_hourly
+ where mac=#{mac}
+ AND time between #{startTime} and #{endTime}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0