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-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 98bffb3..1c1b45b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -86,7 +86,6 @@
queryWrapper.select("mac", "name").in("mac", macs);
List<Device> devices = deviceMapper.selectList(queryWrapper);
-
//������������
List<String> times = (List<String>) params.remove("times");
//������code
@@ -100,7 +99,8 @@
for (String start : times) {
if ("hour".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
- timeUnits = "hourly";
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.getDate(start, DateUtils.yyyy_MM_dd_EN), DateUtils.yyyyMM_EN);
+ timeUnits = "hourly_" + yearAndMonth;
dateFormat = "%Y-%m-%d %H";
} else if ("day".equals(type)) {
end = DateUtils.getDateAddMonth(start, 1);
@@ -146,26 +146,26 @@
@Override
public Device getDeviceByMac(String mac) {
- Map<String,Object> deviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE,mac);
+ Map<String, Object> deviceMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
Device device = JSON.parseObject(JSON.toJSONString(deviceMap), Device.class);
//���map������organizationId���monitorPointId������versionId
- Map<String,Object> organizationMap = (Map<String,Object>)deviceMap.get("organization");
- Map<String,Object> monitorPointMap = (Map<String,Object>)deviceMap.get("monitorPoint");
- Map<String,Object> versionMap = (Map<String,Object>)deviceMap.get("version");
+ Map<String, Object> organizationMap = (Map<String, Object>) deviceMap.get("organization");
+ Map<String, Object> monitorPointMap = (Map<String, Object>) deviceMap.get("monitorPoint");
+ Map<String, Object> versionMap = (Map<String, Object>) deviceMap.get("version");
device.setDeviceVersionId((Integer) versionMap.get("id"));
device.setOrganizationId((Integer) organizationMap.get("id"));
device.setMonitorPointId((Integer) monitorPointMap.get("id"));
//������������������������������������
- if(ObjectUtils.isEmpty(device)){
+ if (ObjectUtils.isEmpty(device)) {
return getDeviceByMacFromDB(mac);
}
return device;
}
- private Device getDeviceByMacFromDB(String mac){
+ private Device getDeviceByMacFromDB(String mac) {
QueryWrapper<Device> wrapper = new QueryWrapper<>();
- wrapper.eq("mac",mac);
- wrapper.eq("is_delete",Constants.NOT_DELETE);
+ wrapper.eq("mac", mac);
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
return deviceMapper.selectOne(wrapper);
}
--
Gitblit v1.8.0