From af819f7cecad3a63d7e7b6417a12f04f3fd6ed86 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Aug 2022 15:16:24 +0800
Subject: [PATCH] 风场模型基准信息相关代码
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 71 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 32 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 92e0bf6..f88fb70 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
@@ -14,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;
@@ -100,7 +101,7 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
-
+
@Override
@Transactional
public VersionDTO update(VersionUpdateForm form) {
@@ -167,10 +168,11 @@
Integer id = form.getId();
//������������������������������������������������������������
QueryWrapper<OrganizationUnitAlarm> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_delete",Constants.NOT_DELETE);
- queryWrapper.eq("version_id",id);
+ 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)){
+ if (!ObjectUtils.isEmpty(organizationUnitAlarms)) {
dto.setCode(ResponseCodeEnum.VERSION_USED.getCode());
dto.setMsg(ResponseCodeEnum.VERSION_USED.getMsg());
return dto;
@@ -208,28 +210,30 @@
}
//������������������������������������
QueryWrapper<VersionSensorUnit> queryOldWrapper = new QueryWrapper<>();
- queryOldWrapper.eq("version_id",versionId);
- queryOldWrapper.eq("is_delete",Constants.NOT_DELETE);
+ 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->{
+ sensorUnits.forEach(value -> {
value.setVersionId(versionId);
- if(!oldSensorUnits.contains(value))
+ if (!oldSensorUnits.contains(value))
insertList.add(value);
});
- oldSensorUnits.forEach(value->{
- if(!sensorUnits.contains(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);
+ 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);
@@ -237,20 +241,20 @@
//���������������������������
QueryWrapper<OrganizationUnitAlarm> queryOrgUnitAlarmWrapper = new QueryWrapper<>();
queryOrgUnitAlarmWrapper.select("distinct organization_id");
- queryOrgUnitAlarmWrapper.eq("version_id",versionId);
- queryOrgUnitAlarmWrapper.eq("is_delete",Constants.NOT_DELETE);
+ 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()));
+ 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);
+ 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) {
@@ -263,6 +267,9 @@
organizationUnitAlarmMapper.insert(organizationUnitAlarm);
}
}
+ //������deviceInfo������
+ CacheUtils.refreshDeviceAlarmInfo();
+ CacheUtils.refreshSpecialDeviceAlarmInfo();
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -303,11 +310,11 @@
if (ObjectUtils.isEmpty(querySensors)) {
dto.setTotal(0);
dto.setPages(0);
- }else{
+ } else {
dto.setTotal(querySensors.size());
- double querySize = (double)querySensors.size();
- double dSize = (double)size;
- dto.setPages((int)Math.ceil(querySize/dSize));
+ double querySize = (double) querySensors.size();
+ double dSize = (double) size;
+ dto.setPages((int) Math.ceil(querySize / dSize));
}
dto.setSize(size);
dto.setCurrent(page);
@@ -323,7 +330,7 @@
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);
+ 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) {
@@ -331,16 +338,16 @@
}
//������������id������������
List<Version> versions = new ArrayList<>();
- if(!ObjectUtils.isEmpty(versionIds))
+ if (!ObjectUtils.isEmpty(versionIds))
versions = versionMapper.selectBatchIds(versionIds);
//������������������
List<VersionDTO> versionDTOS = new ArrayList<>();
- versions.forEach(value->versionDTOS.add(new VersionDTO(value)));
+ 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