From 59b3b2b0c7a55b8acd6f122dad4b2ff8df1b1bce Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Jun 2021 11:16:23 +0800
Subject: [PATCH] screen-manage 更新组织维护组织型号关系表
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 780bc84..26f3540 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) {
@@ -198,7 +198,7 @@
versionSensorUnitMapper.update(null, deleteWrapper);
//������������������id������code
for (VersionSensorUnit sensorUnit : sensorUnits) {
- Sensor sensor = sensorMapper.selectById(sensorUnit.getId());
+ Sensor sensor = sensorMapper.selectById(sensorUnit.getSensorId());
sensorUnit.setSensorCode(sensor.getCode());
}
//���������������������������������
@@ -260,5 +260,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