From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Thu, 08 Aug 2019 17:03:55 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- 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