From db2b30bbe239427a89521cd858b2b191d56086ef Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Sep 2021 09:41:06 +0800
Subject: [PATCH] 获取有走航车数据日期，device修改，绑定国控站
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 1a8aa11..f235c31 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
@@ -1,6 +1,7 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.OrganizationUnitAlarm;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
@@ -74,11 +75,23 @@
//������������������������������������������
OrganizationUnitAlarm oldRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
//������
- organizationUnitAlarmMapper.updateById(organizationUnitAlarm);
+ 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.flushDeviceAlarmInfo();
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
--
Gitblit v1.8.0