修改时间bug

kaiyu

2020-10-21 5e9129373399e9cc3bdecf9b8365e1c6b6b0ecdd

修改时间bug

 src/main/java/com/moral/task/HistoryFiveMinutelyTask.java

@@ -80,7 +80,7 @@
                });
                String keyAndValueJson = JSON.toJSONString(keyAndValueMap);
                insertDataMap.put("mac", mac);
                insertDataMap.put("time", params.get("start"));
                insertDataMap.put("time", params.get("end"));
                insertDataMap.put("json", keyAndValueJson);
                insertDatas.add(insertDataMap);
            }
@@ -114,12 +114,14 @@
        if (endMinute >= 5) {
            StringBuilder time = new StringBuilder(sdf.format(date));
            startTime = time.replace(15, 19, "0:00").toString();
            endTime = time.replace(15, 19, "4:00").toString();
            endTime = time.replace(15, 19, "5:00").toString();
        } else {
            StringBuilder endTimesb = new StringBuilder(sdf.format(date));
            endTime = endTimesb.replace(15, 19, "0:00").toString();
            date = DateUtil.rollMinute(date, -5);
            StringBuilder time = new StringBuilder(sdf.format(date));
            startTime = time.replace(15, 19, "5:00").toString();
            endTime = time.replace(15, 19, "9:00").toString();
            StringBuilder startTimesb = new StringBuilder(sdf.format(date));
            startTime = startTimesb.replace(15, 19, "5:00").toString();

        }

        year = DateUtil.getYear(date);

 src/main/resources/mapper/HistoryFiveMinutelyMapper.xml

@@ -11,7 +11,7 @@
        </foreach>
        FROM
        history_minutely_${yearAndMonth} h
        where  h.time<![CDATA[>=]]>#{start} and h.time <![CDATA[<=]]>  #{end}
        where  h.time<![CDATA[>=]]>#{start} and h.time <![CDATA[<]]>  #{end}
        group by h.mac
    </select>