update

ZhuDongming

2020-04-29 4d7d1d0844b60c28c6c6c55635e3d68b009248bc

update

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

@@ -1342,7 +1342,12 @@
        String et = parameters.get("endTime").toString();
        String endYearAndDay = et.substring(0, et.lastIndexOf("-"));
        String endHour = et.substring(et.lastIndexOf("-") + 1);
        String endTime = endYearAndDay + " " + endHour + ":00:00";
        int endHourValue = Integer.valueOf(endHour);
        int startHourValue = Integer.valueOf(startHour);
        if (endHourValue <= startHourValue) {
            endHourValue = startHourValue + 1;
        }
        String endTime = startYearAndDay + " " + endHourValue + ":00:00";
        parameters.put("startTime", startTime);
        parameters.put("endTime", endTime);
        String mac = parameters.get("mac").toString();
@@ -1478,7 +1483,7 @@
        int endHourValue =Integer.valueOf(endHour);
        int startHourValue =Integer.valueOf(startHour);
        if(endHourValue<=startHourValue){
            endHourValue=23;
            endHourValue = startHourValue + 1;
        }
        String endTime = startYearAndDay + " " + endHourValue + ":00:00";
        parameters.put("startTime", startTime);

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java