From 5688e9adb709a253e1ce69b510457b9c88a645a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Sep 2021 16:39:18 +0800
Subject: [PATCH] screnn_api特殊设备实体类修改,走航车实时websocket,manage设备补偿

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

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
index 112117f..056297f 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java
@@ -76,16 +76,23 @@
         OrganizationUnitAlarm oldRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
         //������
         UpdateWrapper updateWrapper = new UpdateWrapper();
-        if(organizationUnitAlarm.getAlarmLevel().equals(""))
+
+        if(organizationUnitAlarm.getAlarmLevel().equals("[]"))
             updateWrapper.set("alarm_level",null);
+        else
+            updateWrapper.set("alarm_level",organizationUnitAlarm.getAlarmLevel());
+
         if(organizationUnitAlarm.getShowUnitKey()!=null)
             updateWrapper.set("show_unit_key",organizationUnitAlarm.getShowUnitKey());
+
         updateWrapper.eq("id",organizationUnitAlarm.getId());
+
         organizationUnitAlarmMapper.update(null,updateWrapper);
         //������������������������������������������
         OrganizationUnitAlarm newRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
         //������deviceInfo������
         CacheUtils.refreshDeviceAlarmInfo();
+        CacheUtils.refreshSpecialDeviceAlarmInfo();
         //������������������
         dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
         dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());

--
Gitblit v1.8.0