From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 insertions(+), 12 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 1078b72..452227f 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,8 @@
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;
@@ -44,6 +42,8 @@
VersionSensorUnitMapper versionSensorUnitMapper;
@Autowired
SensorMapper sensorMapper;
+ @Autowired
+ OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
@Override
public VersionQueryDTO query(VersionQueryForm form) {
@@ -165,6 +165,16 @@
VersionDTO dto = new VersionDTO();
//������
Integer id = form.getId();
+ //������������������������������������������������������������
+ QueryWrapper<OrganizationUnitAlarm> queryWrapper = new QueryWrapper<>();
+ 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);
//������������
@@ -191,20 +201,66 @@
//������
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) {
Sensor sensor = sensorMapper.selectById(sensorUnit.getSensorId());
sensorUnit.setSensorCode(sensor.getCode());
}
- //���������������������������������
- for (VersionSensorUnit sensorUnit : sensorUnits) {
- sensorUnit.setVersionId(versionId);
+ //������������������������������������
+ 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);
+ });
+ //������������
+ 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("orgniazation_id",organizationId);
+ deleteOrganizationUnitAlarmWrapper.eq("version_id",versionId);
+ deleteOrganizationUnitAlarmWrapper.eq("sensor_code",versionSensorUnit.getSensorCode());
+ 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);
+ }
}
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
@@ -260,5 +316,30 @@
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