From 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 01 Sep 2021 11:02:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

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

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 6962fd1..e802b36 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -447,7 +447,7 @@
         Integer orgId = specialDevice.getOrganizationId();
         deleteOrganizationUnitAlarm(orgId, versionId);
         //������deviceInfo������
-        CacheUtils.refreshDeviceAlarmInfo();
+        CacheUtils.refreshSpecialDeviceAlarmInfo();
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
@@ -511,6 +511,9 @@
         Organization organization = organizationMapper.selectById(specialDevice.getOrganizationId());
         orgInfo.put("id", organization.getId());
         orgInfo.put("name", organization.getName());
+        orgInfo.put("areaCode", organization.getAreaCode());
+        orgInfo.put("cityCode", organization.getCityCode());
+        orgInfo.put("provinceCode", organization.getProvinceCode());
         specialDeviceInfo.put("organization", orgInfo);
 
         setDeviceInfoToRedis(mac, specialDeviceInfo);

--
Gitblit v1.8.0