From eccde23ea401394aed432865bfbbbcb89539ba20 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Wed, 18 Aug 2021 15:33:45 +0800 Subject: [PATCH] 特殊设备历史表数据查询、删除,校准接口判断特殊设备表 --- screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 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..31078ec 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 @@ -7,12 +7,15 @@ 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 +57,31 @@ 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()); + //������ + organizationUnitAlarmMapper.updateById(organizationUnitAlarm); + //������������������������������������������ + OrganizationUnitAlarm newRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId()); + //������deviceInfo������ + CacheUtils.refreshDeviceAlarmInfo(); + //������������������ + dto.setCode(ResponseCodeEnum.SUCCESS.getCode()); + dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); return dto; } } -- Gitblit v1.8.0