From b8327edbe066671efba657c0f78598400c6d99c0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 10:22:45 +0800
Subject: [PATCH] screen-api 增加设备时维护组织型号关系表
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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..1078b72 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
@@ -8,6 +8,7 @@
import com.moral.api.entity.User;
import com.moral.api.entity.Version;
import com.moral.api.entity.VersionSensorUnit;
+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;
@@ -41,6 +42,8 @@
VersionMapper versionMapper;
@Autowired
VersionSensorUnitMapper versionSensorUnitMapper;
+ @Autowired
+ SensorMapper sensorMapper;
@Override
public VersionQueryDTO query(VersionQueryForm form) {
@@ -193,6 +196,11 @@
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);
@@ -205,9 +213,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,7 +243,20 @@
//������������������
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;
}
--
Gitblit v1.8.0