From 153144cbee10bb4999242bc62358ffe63ca9ceb9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 07 Jul 2020 09:30:04 +0800
Subject: [PATCH] update

---
 src/main/java/com/moral/controller/ScreenController.java |   13 ++++++++++---
 1 files changed, 10 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..79c159c 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,
@@ -713,6 +719,9 @@
             String time = map.get("time").toString();
             time = time.substring(time.length() - 2);
             map.put("time", Integer.valueOf(time));
+            if(parameters.get("type").equals("day")){
+                map.put("time", Integer.valueOf(time)+1);
+            }
             map.put("value", map.remove(sensorKey));
         }
         return new ResultBean<List<Map<String, Object>>>(list);
@@ -1729,7 +1738,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 +1859,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