From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
index a8ad783..6d310b9 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.Device;
-import com.moral.api.entity.OrganizationUnitAlarm;
-import com.moral.api.entity.Sensor;
-import com.moral.api.entity.Version;
+import com.moral.api.entity.*;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.service.DeviceService;
import com.moral.api.service.OrganizationUnitAlarmService;
@@ -49,7 +46,13 @@
@Override
public List<Sensor> queryAlarmLevel(String mac) {
Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
- Version version = device.getVersion();
+ Version version;
+ if (ObjectUtils.isEmpty(device)){
+ SpecialDevice specialDevice = (SpecialDevice) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE_INFO,mac);
+ version = specialDevice.getVersion();
+ }else {
+ version = device.getVersion();
+ }
List<Sensor> sensors = version.getSensors();
//������������������������������������������������
if (ObjectUtils.isEmpty(sensors)) {
--
Gitblit v1.8.0