From e294ea312fe1994c3ddfe26595ee414e6612eb0c Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 04 Dec 2020 11:37:36 +0800 Subject: [PATCH] 大屏report_avg_datas接口24点无数据处理 --- src/main/java/com/moral/controller/OrganizationLayoutController.java | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/moral/controller/OrganizationLayoutController.java b/src/main/java/com/moral/controller/OrganizationLayoutController.java index 8482391..60993a9 100644 --- a/src/main/java/com/moral/controller/OrganizationLayoutController.java +++ b/src/main/java/com/moral/controller/OrganizationLayoutController.java @@ -1,22 +1,27 @@ package com.moral.controller; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.annotation.Resource; + import com.moral.common.bean.ResultBean; import com.moral.entity.DeviceVersion; -import com.moral.entity.Sensor; import com.moral.entity.layout.RealTimeDeviceLayout; import com.moral.entity.layout.RtdLayoutUpload; import com.moral.entity.layout.SensorComb; import com.moral.service.DeviceVersionService; import com.moral.service.OrganizationLayoutService; import com.moral.service.SensorService; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("org-layout") @@ -30,9 +35,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