From 3bb54d86b0a80a13374b10b1a9d9d0f131a85f9d Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Mon, 16 Jul 2018 15:08:58 +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