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-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
index 4481338..51167ed 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java
@@ -1,6 +1,7 @@
package com.moral.api.service.impl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -13,6 +14,7 @@
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryMinutelyService;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
@Service
@@ -24,18 +26,22 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
@Transactional
public void insertHistoryMinutely(Map<String, Object> data) {
Map<String, Object> result = new HashMap<>();
- Object ver = data.remove("ver");
-
Map<String, Object> dataAdjust = new HashMap<>(data);
-
- Object mac = data.remove("mac");
+ String mac = data.remove("mac").toString();
+ //������mac������������
+ Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
+ Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version");
+ Integer version = (Integer) versionInfo.get("id");
result.put("mac", mac);
- result.put("version", ver);
+ result.put("version", version);
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
result.put("time", time);
--
Gitblit v1.8.0