jinpengyong
2020-06-22 cc31761e9ccadea2914af450b5414824ba983f38
src/main/java/com/moral/controller/ScreenController.java
@@ -1719,7 +1719,7 @@
            params.put("unit",parameters.get("unit"));
            params.put("description",parameters.get("description"));
            String paramsJson = params.toJSONString();
            model.addObject("uavDroppointParams", paramsJson);
            model.addObject("uavChannelParams", paramsJson);
            model.setViewName("uavchannel");
            return model;
        } else {
@@ -1748,8 +1748,8 @@
        String startTime = startYearAndDay + " " + startHour + ":00:00";
        String et = parameters.get("endTime").toString();
        String endHour = et.substring(et.lastIndexOf("-") + 1);
        int endHourValue = Integer.valueOf(endHour);
        int startHourValue = Integer.valueOf(startHour);
        int endHourValue = Integer.parseInt(endHour);
        int startHourValue = Integer.parseInt(startHour);
        if (endHourValue <= startHourValue) {
            endHourValue = startHourValue + 1;
        }
@@ -1767,7 +1767,7 @@
            params.put("unit",parameters.get("unit"));
            params.put("description",parameters.get("description"));
            String paramsJson = params.toJSONString();
            model.addObject("uavDroppointParams", paramsJson);
            model.addObject("uavTracingParams", paramsJson);
            model.setViewName("uavtracing");
            return model;
        } else {