| | |
|---|
| | | public ReturnT insertHistoryMinutelyTable(String params) { |
|---|
| | | //正式环境使用 |
|---|
| | | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:00"); |
|---|
| | | Date endTimeDate = new Date(); |
|---|
| | | Date startTimeDate = DateUtil.rollMinute(endTimeDate, -1); |
|---|
| | | Date insertTimeDate = new Date(); |
|---|
| | | Date startTimeDate = DateUtil.rollMinute(insertTimeDate, -2); |
|---|
| | | Date endTimeDate = DateUtil.rollMinute(insertTimeDate, -1); |
|---|
| | | StringBuilder insertTime = new StringBuilder(sdf.format(insertTimeDate)); |
|---|
| | | StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate)); |
|---|
| | | StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate)); |
|---|
| | | String queryYearAndMonthDay = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate) + DateUtil.getDay(startTimeDate); |
|---|
| | |
|---|
| | | Map<String, Object> minutelyDataMap = new LinkedHashMap<>(); |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | minutelyDataMap.put("mac", deviceData.get("mac")); |
|---|
| | | minutelyDataMap.put("time", endTime.toString()); |
|---|
| | | minutelyDataMap.put("time", insertTime.toString()); |
|---|
| | | for (String key : deviceData.keySet()) { |
|---|
| | | if (!key.equals("mac") && !key.startsWith("M")) { |
|---|
| | | List<Object> date = new ArrayList<>(); |
|---|
