Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

 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);