From 3be7bd55ff0a4ab2ed25b46cdfd1dede92300ea3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 26 Aug 2021 11:15:29 +0800
Subject: [PATCH] kafa数据从redis获取型号，当前组织下走航车设备列表
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 561c8b6..98bffb3 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
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Device;
import com.moral.api.entity.Sensor;
@@ -13,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -91,7 +93,7 @@
String sensorCode = params.get("sensorCode").toString();
String end;
String timeUnits;
-
+ String dateFormat;
//���������������,time=data
List<Map<String, Object>> result = new ArrayList<>();
@@ -99,18 +101,21 @@
if ("hour".equals(type)) {
end = DateUtils.getDateAddDay(start, 1);
timeUnits = "hourly";
+ dateFormat = "%Y-%m-%d %H";
} else if ("day".equals(type)) {
end = DateUtils.getDateAddMonth(start, 1);
timeUnits = "daily";
+ dateFormat = "%Y-%m-%d";
} else {
end = DateUtils.getDateAddYear(start, 1);
timeUnits = "monthly";
+ dateFormat = "%Y-%m";
}
params.put("timeUnits", timeUnits);
params.put("start", start);
params.put("end", end);
params.put("macs", macs);
- params.put("dateFormat", "%Y-%m-%d %H:%i:%s");
+ params.put("dateFormat", dateFormat);
//���������������������������������
List<Map<String, Object>> list = deviceMapper.getTrendChartData(params);
@@ -139,5 +144,30 @@
return result;
}
+ @Override
+ public Device getDeviceByMac(String 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");
+ device.setDeviceVersionId((Integer) versionMap.get("id"));
+ device.setOrganizationId((Integer) organizationMap.get("id"));
+ device.setMonitorPointId((Integer) monitorPointMap.get("id"));
+ //������������������������������������
+ if(ObjectUtils.isEmpty(device)){
+ return getDeviceByMacFromDB(mac);
+ }
+ return device;
+ }
+
+ private Device getDeviceByMacFromDB(String mac){
+ QueryWrapper<Device> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac",mac);
+ wrapper.eq("is_delete",Constants.NOT_DELETE);
+ return deviceMapper.selectOne(wrapper);
+ }
+
}
--
Gitblit v1.8.0