From 289c94657278daacf601e379549c519d8f6e8d5a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Jul 2023 09:54:58 +0800
Subject: [PATCH] feature：补充天数据
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 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 ca43937..060cb1c 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
@@ -109,6 +109,15 @@
}
@Override
+ public List<HistoryDaily> getHistoryDailyByMacAndTimeSlot( List<String> macs, Date startDate, Date endDate) {
+ QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>();
+ wrapper.in("mac", macs);
+ wrapper.between("time", startDate, endDate);
+ List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper);
+ return historyDailies;
+ }
+
+ @Override
public Map<String, Object> getThermodynamicDiagramDataByOrgIdSensorCodeTime(Map<String, Object> parameters) {
Map<String, Object> resultMap = new HashMap<>();
int orgId = Integer.parseInt(parameters.get("organization_id").toString());
@@ -276,6 +285,9 @@
boundary_point_one.add(Double.parseDouble(boundary_point_one_array[0]));
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);
@@ -450,6 +462,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());
--
Gitblit v1.8.0