From 0e0643aed8857e9b845ee5dcc56cdec652bc89f2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Aug 2023 15:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 08034c6..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("[]"))
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