| | |
| | | } |
| | | if (code.equals("2")){ |
| | | HashMap<String, Object> result = new HashMap<>(); |
| | | String time1 = deviceData.get("time").toString(); |
| | | long l = Long.parseLong(time1); |
| | | // String time1 = deviceData.get("time").toString(); |
| | | // long l = Long.parseLong(time1); |
| | | |
| | | SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00"); |
| | | String format1 = simpleDateFormat.format(l); |
| | | Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); |
| | | // String format1 = simpleDateFormat.format(l); |
| | | // Date date = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); |
| | | |
| | | String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(date, -2), DateUtils.yyyyMM_EN); |
| | | String format = simpleDateFormat.format(DateUtils.addHours(date, -2)); |
| | | String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -2), DateUtils.yyyyMM_EN); |
| | | String format = simpleDateFormat.format(DateUtils.addHours(time, -2)); |
| | | result.put("timeUnits",yearAndMonth); |
| | | result.put("mac",mac); |
| | | result.put("time",format); |