From 19b72fbd2e6b30a23a06dd284619784a096bc896 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 26 Aug 2021 11:33:56 +0800
Subject: [PATCH] screen-manage 单位转换插入添加日志功能 修复organization插入Bug
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 139 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 124 insertions(+), 15 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
index f99c16c..636d821 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -4,10 +4,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.config.mybatis.wrapper.NullFilterWrapper;
-import com.moral.api.entity.Sensor;
-import com.moral.api.entity.User;
-import com.moral.api.entity.Version;
-import com.moral.api.entity.VersionSensorUnit;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.OrganizationUnitAlarmMapper;
+import com.moral.api.mapper.SensorMapper;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
@@ -15,6 +14,7 @@
import com.moral.api.pojo.form.version.*;
import com.moral.api.service.VersionService;
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 com.moral.util.ConvertUtils;
@@ -41,6 +41,10 @@
VersionMapper versionMapper;
@Autowired
VersionSensorUnitMapper versionSensorUnitMapper;
+ @Autowired
+ SensorMapper sensorMapper;
+ @Autowired
+ OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
@Override
public VersionQueryDTO query(VersionQueryForm form) {
@@ -97,7 +101,7 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
+
@Override
@Transactional
public VersionDTO update(VersionUpdateForm form) {
@@ -162,6 +166,17 @@
VersionDTO dto = new VersionDTO();
//������
Integer id = form.getId();
+ //������������������������������������������������������������
+ QueryWrapper<OrganizationUnitAlarm> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id");
+ queryWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryWrapper.eq("version_id", id);
+ List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryWrapper);
+ if (!ObjectUtils.isEmpty(organizationUnitAlarms)) {
+ dto.setCode(ResponseCodeEnum.VERSION_USED.getCode());
+ dto.setMsg(ResponseCodeEnum.VERSION_USED.getMsg());
+ return dto;
+ }
//������������������������������������������
Version oldVersion = versionMapper.selectById(id);
//������������
@@ -188,16 +203,72 @@
//������
List<VersionSensorUnit> sensorUnits = form.getSensorUnits();
Integer versionId = form.getVersionId();
- //������������������������������������
- UpdateWrapper deleteWrapper = new UpdateWrapper();
- deleteWrapper.eq("version_id", versionId);
- deleteWrapper.set("is_delete", Constants.DELETE);
- versionSensorUnitMapper.update(null, deleteWrapper);
- //���������������������������������
+ //������������������id������code
for (VersionSensorUnit sensorUnit : sensorUnits) {
- sensorUnit.setVersionId(versionId);
+ Sensor sensor = sensorMapper.selectById(sensorUnit.getSensorId());
+ sensorUnit.setSensorCode(sensor.getCode());
+ }
+ //������������������������������������
+ QueryWrapper<VersionSensorUnit> queryOldWrapper = new QueryWrapper<>();
+ queryOldWrapper.eq("version_id", versionId);
+ queryOldWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<VersionSensorUnit> oldSensorUnits = versionSensorUnitMapper.selectList(queryOldWrapper);
+ //������������������������(������������������������)
+ List<VersionSensorUnit> insertList = new ArrayList<>();
+ List<VersionSensorUnit> deleteList = new ArrayList<>();
+ sensorUnits.forEach(value -> {
+ value.setVersionId(versionId);
+ if (!oldSensorUnits.contains(value))
+ insertList.add(value);
+ });
+ oldSensorUnits.forEach(value -> {
+ if (!sensorUnits.contains(value))
+ deleteList.add(value);
+ });
+ //������������
+ if (!ObjectUtils.isEmpty(deleteList)) {
+ UpdateWrapper deleteWrapper = new UpdateWrapper();
+ List<Integer> deleteIds = new ArrayList<>();
+ deleteList.forEach(value -> deleteIds.add(value.getId()));
+ deleteWrapper.in("id", deleteIds);
+ deleteWrapper.set("is_delete", Constants.DELETE);
+ versionSensorUnitMapper.update(null, deleteWrapper);
+ }
+ //������������
+ for (VersionSensorUnit sensorUnit : insertList) {
versionSensorUnitMapper.insert(sensorUnit);
}
+ //���������������������������
+ QueryWrapper<OrganizationUnitAlarm> queryOrgUnitAlarmWrapper = new QueryWrapper<>();
+ queryOrgUnitAlarmWrapper.select("distinct organization_id");
+ queryOrgUnitAlarmWrapper.eq("version_id", versionId);
+ queryOrgUnitAlarmWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrgUnitAlarmWrapper);
+ List<Integer> organizationIds = new ArrayList<>();
+ organizationUnitAlarms.forEach(value -> organizationIds.add(value.getOrganizationId()));
+ for (Integer organizationId : organizationIds) {
+ //������������
+ for (VersionSensorUnit versionSensorUnit : deleteList) {
+ UpdateWrapper deleteOrganizationUnitAlarmWrapper = new UpdateWrapper();
+ deleteOrganizationUnitAlarmWrapper.eq("organization_id", organizationId);
+ deleteOrganizationUnitAlarmWrapper.eq("version_id", versionId);
+ deleteOrganizationUnitAlarmWrapper.eq("sensor_code", versionSensorUnit.getSensorCode());
+ deleteOrganizationUnitAlarmWrapper.set("is_delete", Constants.DELETE);
+ organizationUnitAlarmMapper.update(null, deleteOrganizationUnitAlarmWrapper);
+ }
+ //������������
+ for (VersionSensorUnit versionSensorUnit : insertList) {
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setOrganizationId(organizationId);
+ organizationUnitAlarm.setVersionId(versionId);
+ organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
+ organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarm.setShowUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarmMapper.insert(organizationUnitAlarm);
+ }
+ }
+ //������deviceInfo������
+ CacheUtils.refreshDeviceAlarmInfo();
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -205,9 +276,9 @@
}
@Override
- public VersionDTO queryVersionById(VersionQueryByIdForm form) {
+ public VersionQueryDTO queryVersionById(VersionQueryByIdForm form) {
//������������������
- VersionDTO dto = new VersionDTO();
+ VersionQueryDTO dto = new VersionQueryDTO();
//������
Integer id = form.getId();
Integer size = form.getSize();
@@ -235,9 +306,47 @@
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
- dto.setVersion(version);
+ if (ObjectUtils.isEmpty(querySensors)) {
+ dto.setTotal(0);
+ dto.setPages(0);
+ } else {
+ dto.setTotal(querySensors.size());
+ double querySize = (double) querySensors.size();
+ double dSize = (double) size;
+ dto.setPages((int) Math.ceil(querySize / dSize));
+ }
+ dto.setSize(size);
+ dto.setCurrent(page);
+ VersionDTO versionDTO = new VersionDTO();
+ versionDTO.setVersion(version);
+ dto.setVersionDTOS(Arrays.asList(versionDTO));
return dto;
}
+ @Override
+ public VersionQueryDTO queryByOrganizationId(Integer organizationId) {
+ //������������������
+ VersionQueryDTO dto = new VersionQueryDTO();
+ //������������id
+ QueryWrapper<OrganizationUnitAlarm> queryVersionIdsWrapper = new QueryWrapper<>();
+ queryVersionIdsWrapper.select("DISTINCT version_id").eq("is_delete", Constants.NOT_DELETE).eq("organization_id", organizationId);
+ List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryVersionIdsWrapper);
+ List<Integer> versionIds = new ArrayList<>();
+ for (OrganizationUnitAlarm organizationUnitAlarm : organizationUnitAlarms) {
+ versionIds.add(organizationUnitAlarm.getVersionId());
+ }
+ //������������id������������
+ List<Version> versions = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(versionIds))
+ versions = versionMapper.selectBatchIds(versionIds);
+ //������������������
+ List<VersionDTO> versionDTOS = new ArrayList<>();
+ versions.forEach(value -> versionDTOS.add(new VersionDTO(value)));
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ dto.setVersionDTOS(versionDTOS);
+ return dto;
+ }
}
+
--
Gitblit v1.8.0