From c2b226e7902dbb2b36f349612886ccc7333895e6 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 19 Aug 2019 20:08:44 +0800
Subject: [PATCH] 合并查询无人机平均值，最小值和最大值
---
src/main/java/com/moral/controller/OrganizationLayoutController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/OrganizationLayoutController.java b/src/main/java/com/moral/controller/OrganizationLayoutController.java
index 8482391..7500c98 100644
--- a/src/main/java/com/moral/controller/OrganizationLayoutController.java
+++ b/src/main/java/com/moral/controller/OrganizationLayoutController.java
@@ -30,9 +30,10 @@
@GetMapping("rtd-config")
public ResultBean<Map<String,Object>> getRealTimeDevicetConfig(Integer orgId){
Map<String,Object> resultMap = new HashMap();
- resultMap.put("deviceVersions","");
- resultMap.put("sensors","");
- resultMap.put("rtdLayout","");
+ resultMap.put("deviceVersions",new ArrayList<>());
+ resultMap.put("sensorCombs", new ArrayList<>());
+ resultMap.put("sensors", new ArrayList<>());
+ resultMap.put("rtdLayout", new HashMap<>());
// ������������������������������������������
List<DeviceVersion> deviceVersionList = deviceVersionService.queryByOrgId(orgId);
// ���������������version ������������������
--
Gitblit v1.8.0