From 9188066e4c0ffe7002dfad598910f6567b575b48 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Sep 2021 17:06:34 +0800
Subject: [PATCH] kafka 修改

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 9339dc2..60db004 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -428,8 +428,8 @@
         if (!ObjectUtils.isEmpty(adjustFormula)) {
             Map<String, Object> deviceInfo = getDeviceByMac(mac);
             Map<String, Object> monitorPoint = (Map<String, Object>) deviceInfo.get("monitorPoint");
-            Object areaCode = monitorPoint.get("areaCode");
-            Object cityCode = monitorPoint.get("cityCode");
+            String areaCode = monitorPoint.get("areaCode").toString();
+            String cityCode = monitorPoint.get("cityCode").toString();
 
             Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
             if (ObjectUtils.isEmpty(aqiMap)) {
@@ -448,8 +448,8 @@
         Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
         if (!ObjectUtils.isEmpty(adjustFormula)) {
             Organization organization = specialDeviceMapper.selectOrgByMac(mac);
-            Integer areaCode = organization.getAreaCode();
-            Integer cityCode = organization.getCityCode();
+            String areaCode = organization.getAreaCode().toString();
+            String cityCode = organization.getCityCode().toString();
             Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
             if (ObjectUtils.isEmpty(aqiMap)) {
                 aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);

--
Gitblit v1.8.0