From 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 13:20:25 +0800
Subject: [PATCH] update大屏左侧站点设备查询优化及设备因子名称显示null问题
---
src/main/java/com/moral/controller/ScreenController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 030a524..bf309bd 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -602,6 +602,12 @@
return sensorsMapList;
}
+ @GetMapping("/getSensorsAllMap")
+ public List<Map<String, String>> getSensorsAllMap(String mac) {
+ List<Map<String, String>> sensorsMapList = sensorService.getSensorsAllMap();
+ return sensorsMapList;
+ }
+
@RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)
@ResponseBody
public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,
@@ -620,6 +626,15 @@
@RequestMapping(value = "/get-devices", method = RequestMethod.GET)
@ResponseBody
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "orgId",defaultValue = "5", value = "������Id", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "regionCode",defaultValue = "320583", value = "������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Fe", defaultValue = "31.485018",value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Ge", defaultValue = "121.378395",value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Ke", defaultValue = "31.296614",value = "���������������", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "Le", defaultValue = "120.59651",value = "���������������", required = true, paramType = "query", dataType = "String")
+ })
public ResultBean getDevices(@RequestParam("orgId") Integer orgId, MapBounds mapBounds,
@RequestParam("regionCode") String regionCode) {
ResultBean<List<Device>> resultBean = new ResultBean();
--
Gitblit v1.8.0