From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 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 9200e29..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
@@ -1,18 +1,22 @@
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;
import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmDTO;
import com.moral.api.pojo.dto.organizationUnitAlarm.OrganizationUnitAlarmQueryDTO;
import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmQueryForm;
+import com.moral.api.pojo.form.organizationUnitAlarm.OrganizationUnitAlarmUpdateForm;
import com.moral.api.service.OrganizationUnitAlarmService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.CacheUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -54,6 +58,44 @@
dto.setOrganizationUnitAlarmDTOS(dtos);
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ dto.setCurrent(resultPage.getCurrent());
+ dto.setPages(resultPage.getPages());
+ dto.setSize(resultPage.getSize());
+ dto.setTotal(resultPage.getTotal());
+ return dto;
+ }
+
+ @Override
+ @Transactional
+ public OrganizationUnitAlarmDTO update(OrganizationUnitAlarmUpdateForm form) {
+ //������������������
+ OrganizationUnitAlarmDTO dto = new OrganizationUnitAlarmDTO();
+ //������
+ OrganizationUnitAlarm organizationUnitAlarm = form.formConvertEntity();
+ //������������������������������������������
+ 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());
return dto;
}
}
--
Gitblit v1.8.0