Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-01-31 3c0ccc88ffa8a651ec78a611ffe75775222ebf07

 screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -626,9 +626,9 @@
        }
        //从数据库获取数据参数
        Map<String, Object> params = new HashMap<>();
        Date startTime=null;
        Date endTime=null;
        if (!ObjectUtils.isEmpty(start) || !ObjectUtils.isEmpty(end)){
        Date startTime;
        Date endTime;
        if (!ObjectUtils.isEmpty(start) && !ObjectUtils.isEmpty(end)){
            startTime = DateUtils.getDate(start, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            endTime = DateUtils.getDate(end, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        }else {
@@ -665,7 +665,7 @@
        data.forEach((key, value) -> {
            Map<String, Object> historyHourly = new HashMap<>();
            historyHourly.put("mac", key);
            historyHourly.put("time",start);
            historyHourly.put("time",startTime);

            Map<String, Object> jsonMap = new HashMap<>();
            Map<String, Object> map = new HashMap<>();