forked from moral

parent: 25576c04 | patch | commit | ignore whitespace
jinpengyong
2022-11-30 143d5a9187196d30131838874ba306bfb79ebe77 
解决国控站数据补偿问题
1 files modified
4 ■■■■■ changed files
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 4 ●●●●● patch | view | raw | blame | history 
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java


@@ -467,9 +467,9 @@


                    HashMap<String, Object> result = new HashMap<>();


                    String dataTime = deviceData.get("DataTime").toString();


                    Date time = DateUtils.getDate(dataTime, DateUtils.yyyyMMddHHmmss_EN);


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


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


                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");


                    String format = simpleDateFormat.format(DateUtils.addHours(time, -1));


                    String format = simpleDateFormat.format(DateUtils.addHours(time, -2));


                    result.put("timeUnits",yearAndMonth);


                    result.put("mac",mac);


                    result.put("time",format);