From f145f5ca0b1beef1300ef73ed1393af63413779d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 06 Jul 2020 14:28:53 +0800
Subject: [PATCH] add国控、省控、县控图标
---
src/main/java/com/moral/controller/ScreenController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 8127aaa..676b2c9 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,
@@ -1729,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();
@@ -1850,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