更改获取数据时间值

kaiyu

2020-11-16 8489ee9f8d25d41a91061934e102ccc9b39d5b05

更改获取数据时间值

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

@@ -704,13 +704,32 @@
            parameters.put("sensors", Arrays.asList(sensorKey));
            // monitorPointService.isCompensateCalculation(parameters);
            list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
            list.remove(0);
            if (list.size() == 23) {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                //获取全格式时间yyyy-MM-dd HH:mm:ss
                time1 = time1 + " 00:00:00";
                Date date = sdf.parse(time1);
                date = DateUtil.rollDay(date, 1);
                //将全格式时间截取
                String time2 = sdf2.format(date);
                parameters.put("time", time2);
                List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
                if(!ObjectUtils.isEmpty(nextDayList)){
                    time1=time1.replaceAll(" 00:00:00"," 24");
                    Map<String, Object> datas = nextDayList.get(0);
                    datas.put("time",time1);
                    list.add(datas);
                }
            }
            for (Map<String, Object> map : list) {
                String time = map.get("time").toString();
                time = time.substring(time.length() - 2);
                map.put("time", Integer.valueOf(time));
                if (parameters.get("type").equals("day")) {
             /*   if (parameters.get("type").equals("day")) {
                    map.put("time", Integer.valueOf(time) + 1);
                }
                }*/
                map.put("value", map.remove(sensorKey));
            }
        }

 src/main/java/com/moral/util/DateUtil.java

@@ -100,6 +100,9 @@
        return calendar.get(Calendar.HOUR_OF_DAY);
    }




    /**
     * 功能描述：返回分
     *
@@ -152,6 +155,28 @@
        return new Date(d.getTime() + minute * 60 * 1000);
    }

    /**
     * 功能描述：对时间进行小时的加减
     *
     * @param
     *
     * @return 返回日期类型
     */
    public static Date rollHour(Date d, int hour) {
        return new Date(d.getTime() + hour * 60 * 60 * 1000);
    }

    /**
     * 功能描述：对时间进行天的加减
     *
     * @param
     *
     * @return 返回日期类型
     */
    public static Date rollDay(Date d, int day) {
        return new Date(d.getTime() + day * 24 * 60 * 60 * 1000);
    }


    /**
     * 前/后?月