From f5e9467cdc5535be9d345914f828ac5a1ebe9cb5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Jul 2020 17:21:04 +0800
Subject: [PATCH] 无人机应用大屏页面update
---
src/main/java/com/moral/controller/ScreenController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 030a524..9a1c0ce 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();
@@ -1672,7 +1687,7 @@
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
model.addObject("uavDroppointParams", paramsJson);
- model.setViewName("uavdroppoint");
+ model.setViewName("uavdroppointnew");
return model;
} else {
StringBuilder msg = new StringBuilder();
@@ -1720,7 +1735,7 @@
params.put("description",parameters.get("description"));
String paramsJson = params.toJSONString();
model.addObject("uavChannelParams", paramsJson);
- model.setViewName("uavchannel");
+ model.setViewName("uavchannelnew");
return model;
} else {
StringBuilder msg = new StringBuilder();
@@ -1841,8 +1856,6 @@
String YearAndDay = time.substring(0, time.lastIndexOf("-"));
String Hour = time.substring(time.lastIndexOf("-") + 1);
String Time = YearAndDay + " " + Hour + ":00:00";
-
-
int monitPointId=Integer.parseInt(monitPointIdS);
//������������������
JSONObject params=monitorPointService.getMonitorPointById(monitPointId,Time,3,sensor);
--
Gitblit v1.8.0