From da4e29e96a1d01fd9fed34e8b1e993081c3fd450 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 22 Sep 2023 11:14:48 +0800
Subject: [PATCH] feat:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 5a43e82..0a3d387 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -59,19 +59,24 @@
DeviceMapper deviceMapper;
@Override
- public List<DeviceAndFiveMinuteDataDTO> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form) {
+ public List<Map<String, Object>> queryDeviceAndFiveMinuteData(QueryDeviceAndFiveMinuteDataForm form) {
//������
+ String times = DateUtils.dateToDateString(new Date(),DateUtils.yyyyMM_EN);
Integer organizationId = form.getOrganizationId();
Integer regionCode = form.getRegionCode();
String sensorCode = form.getSensorCode();
- Map<String, Object> params = new HashMap<>();
+ String type = "$."+ sensorCode;
String region = null;
+ String endHourlyTime = null;
if (regionCode != null && organizationId!=24) {
region = RegionCodeUtils.regionCodeConvertToName(regionCode);
- params.put("region",region);
- params.put("regionCode",regionCode);
}
- params.put("organizationId",organizationId);
+ if (form.getChooseTime().equals("true")) {
+ endHourlyTime = form.getTime();
+ Date time = DateUtils.convertDate(endHourlyTime);
+ times = DateUtils.dateToDateString(time,DateUtils.yyyyMM_EN);
+ }
+ List<Map<String, Object>> listAll = deviceMapper.deviceList(organizationId,regionCode,region,type,sensorCode,times,endHourlyTime);
//���������������������������������������������������
/*List<MonitorPoint> monitorPoints = monitorPointService.queryByOrgIdAndRegionCode(new MonitorPointQueryForm(organizationId, regionCode));
List<Device> devices = new ArrayList<>();
@@ -87,7 +92,7 @@
}*/
//���������������������������������
- List<Device> devices = deviceMapper.deviceList(organizationId,regionCode,region);
+ /*List<Device> devices = new ArrayList<>();
List<DeviceAndFiveMinuteDataDTO> dtos = new ArrayList<>();
if (form.getChooseTime().equals("true")) {
String time = form.getTime();
@@ -125,8 +130,8 @@
dto.setDevice(device);
dto.setSensorValue(sensorValue);
dtos.add(dto);
- }
- return dtos;
+ }*/
+ return listAll;
}
@Override
--
Gitblit v1.8.0