Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

 src/main/java/com/moral/controller/ScreenController.java

@@ -1687,7 +1687,7 @@
            params.put("description",parameters.get("description"));
            String paramsJson = params.toJSONString();
            model.addObject("uavDroppointParams", paramsJson);
            model.setViewName("uavdroppointnew");
            model.setViewName("uavdroppoint");
            return model;
        } else {
            StringBuilder msg = new StringBuilder();
@@ -1735,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();
@@ -1856,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);