From e608fef1dd88213af3cc7f0fdb8f7952214c64a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 28 Jul 2023 14:21:57 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 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 054382b..f2a4445 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
@@ -68,7 +68,8 @@
@Override
public Map<String, Object> getHourlyAqiByMac(String mac) {
Date now = new Date();
- String time = DateUtils.dateToDateString(now, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+// String time = DateUtils.dateToDateString(now, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ String time = DateUtils.dateToDateString(DateUtils.addHours(now, -1), DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
//������������������
Map<String, Object> params = new HashMap<>();
params.put("timeUnits", DateUtils.dateToDateString(now, DateUtils.yyyyMM_EN));
@@ -481,6 +482,9 @@
boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1]));
boundary_pointList.add(boundary_point_one);
}
+ if (boundary_pointList.size()>0){
+ boundary_pointList.add(boundary_pointList.get(0));
+ }
bound.add(boundary_pointList);
resultMap.put("bound", bound);
List centerPoint = new ArrayList();
@@ -652,6 +656,9 @@
boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1]));
boundary_pointList.add(boundary_point_one);
}
+ if (boundary_pointList.size()>0){
+ boundary_pointList.add(boundary_pointList.get(0));
+ }
bound.add(boundary_pointList);
List centerPoint = new ArrayList();
centerPoint.add(servicesScope.getCenterLongitude());
@@ -706,38 +713,26 @@
public List<Map<String, Object>> getHourCompleteDataByMacSensorCodeDate(Map<String, Object> map) {
String mac = map.get("mac").toString();
String sensorCode = map.get("sensor_code").toString();
- String date = map.get("date").toString();
- String dateTime = date.replace("-", "");
+ String startTime = map.get("startTime").toString();
+ String endTime = map.get("endTime").toString();
+ String dateTime = startTime.replace("-", "");
String timeUnits = dateTime.substring(0, 6) + "_complete";
Map<String, Object> params = new HashMap<>();
params.put("timeUnits", timeUnits);
params.put("mac", mac);
+ params.put("startTime",startTime);
+ params.put("endTime",endTime);
List resultList = new ArrayList();
- for (int i = 0; i < 24; i++) {
+ List<Map<String, Object>> maps = historyHourlyMapper.selectHourlyListData(params);
+ for (Map<String, Object> stringObjectMap : maps) {
Map<String, Object> oneHourDateMap = new HashMap<>();
- String j;
- if (i < 10) {
- j = " 0" + i + ":00:00";
- } else {
- j = " " + i + ":00:00";
- }
- String time = date + j;
- params.put("time", time);
- String resultTime = time.substring(0, 13);
- if (ObjectUtils.isEmpty(historyHourlyMapper.selectHourlyData(params))) {
- oneHourDateMap.put("time", resultTime);
- oneHourDateMap.put("values", new ArrayList<>());
- resultList.add(oneHourDateMap);
- continue;
- }
- String oneHourlyData = null;
- oneHourlyData = historyHourlyMapper.selectHourlyData(params);
- JSONObject js = JSONObject.parseObject(oneHourlyData);
+ Object value = stringObjectMap.get("value");
+ JSONObject js = JSONObject.parseObject(value.toString());
String sensorDate = js.get(sensorCode).toString();
sensorDate = sensorDate.replace("[", "");
sensorDate = sensorDate.replace("]", "");
String[] split = sensorDate.split(",");
- oneHourDateMap.put("time", resultTime);
+ oneHourDateMap.put("time",stringObjectMap.get("time").toString().substring(0,13));
oneHourDateMap.put("values", split);
resultList.add(oneHourDateMap);
}
@@ -760,11 +755,31 @@
List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
return datas;
}
+ @Override
+ public List<HistoryHourly> getValueByMacAndTime(List<String> mac, Date startDate, Date endDate) {
+ QueryWrapper<HistoryHourly> wrapper = new QueryWrapper<>();
+ wrapper.in("mac", mac);
+ wrapper.between("time", startDate, endDate);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
+ List<HistoryHourly> datas = multiTableQuery(wrapper, tableNames);
+ return datas;
+ }
@Override
public List<HistoryHourly> getValueByMacs(List<String> macs, String time) {
QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
queryWrapper.select("time", "value")
+ .likeRight("time", time)
+ .in("mac", macs);
+ Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
+ List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
+ return multiTableQuery(queryWrapper, tableNames);
+ }
+
+ @Override
+ public List<HistoryHourly> getHourlyDataByMacs(List<String> macs, String time) {
+ QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("mac","time", "value")
.likeRight("time", time)
.in("mac", macs);
Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
@@ -846,4 +861,20 @@
return result;
}
+// @Override
+// public String getTVOCByMac(String mac, String time, String sensor,String yearAndMonth) {
+// return historyHourlyMapper.getTVOCByMac(mac,time,sensor,yearAndMonth);
+//
+// }
+//
+// @Override
+// public String getPressureByMac(String mac, String time,String yearAndMonth) {
+// return historyHourlyMapper.getPressureByMac(mac,time,yearAndMonth);
+// }
+//
+// @Override
+// public Map<String, Object> getDataByMac(String mac, String time,String yearAndMonth) {
+// return historyHourlyMapper.getDataByMac(mac,time,yearAndMonth);
+// }
+
}
--
Gitblit v1.8.0