From 7607bab6e868a51609164ce111c9d5e1046cd11f Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 01 Sep 2021 14:44:00 +0800 Subject: [PATCH] 走航车实时websocket,小时表分表 --- screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java index 9d18e07..00c3443 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java @@ -1,11 +1,9 @@ package com.moral.api.service.impl; import com.alibaba.fastjson.JSONObject; -import com.moral.api.entity.HistoryHourly; import com.moral.api.mapper.HistoryHourlyMapper; import com.moral.api.service.DeviceService; import com.moral.api.service.HistoryHourlyService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.moral.constant.Constants; import com.moral.constant.RedisConstants; import com.moral.util.DateUtils; @@ -28,7 +26,7 @@ * @since 2021-06-04 */ @Service -public class HistoryHourlyServiceImpl extends ServiceImpl<HistoryHourlyMapper, HistoryHourly> implements HistoryHourlyService { +public class HistoryHourlyServiceImpl implements HistoryHourlyService { @Autowired private HistoryHourlyMapper historyHourlyMapper; @@ -50,12 +48,13 @@ Map<String, Object> dataAdjust = new HashMap<>(data); Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN); + String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN); Map<String, Object> result = new HashMap<>(); result.put("mac", mac); result.put("time", time); result.put("version", version); - result.put("timeUnits", Constants.UN_ADJUST); + result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST); result.put("value", JSONObject.toJSONString(data)); //������������������insert historyHourlyMapper.insertHistoryHourly(result); @@ -63,13 +62,9 @@ //������������ dataAdjust = deviceService.adjustDeviceData(dataAdjust); - HistoryHourly historyHourly = new HistoryHourly(); - historyHourly.setMac(mac); - historyHourly.setTime(time); - historyHourly.setVersion(version); - historyHourly.setValue(JSONObject.toJSONString(dataAdjust)); - //������������������insert - historyHourlyMapper.insert(historyHourly); + result.put("timeUnits", yearAndMonth); + result.put("value", JSONObject.toJSONString(dataAdjust)); + historyHourlyMapper.insertHistoryHourly(result); } } -- Gitblit v1.8.0