From 1b92dd5752347a995f91d4383a48a5b374d55aaf Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 06 Aug 2019 13:59:55 +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