blame | history | patch | commit | commitdiff | ignore whitespace
lizijie
2021-12-28 d620e65b30db7bc43db71d26fbce36548819eebc 
 screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java


@@ -51,10 +51,10 @@


        Integer version = (Integer) versionInfo.get("id");




        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);


        String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);


        String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);




        result.put("mac", mac);


        result.put("time", time);


        result.put("time", DateUtils.addHours(time, -1));


        result.put("version", version);


        result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST);


        result.put("value", JSONObject.toJSONString(data));