From 76cee9b52e3811dca3f4481610bd0835cbd45c6f Mon Sep 17 00:00:00 2001
From: chenxi <276999030@qq.com>
Date: Sat, 27 May 2023 15:13:49 +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/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