From a8dc519f52dac392047e8d07c6b0aa4616e6eedd Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 09:16:32 +0800
Subject: [PATCH] screen-api 修改增加型号bug
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 88 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 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 d306c56..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
@@ -4,9 +4,11 @@
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.mapper.SensorMapper;
import com.moral.api.mapper.VersionMapper;
import com.moral.api.mapper.VersionSensorUnitMapper;
import com.moral.api.pojo.dto.version.VersionDTO;
@@ -40,6 +42,8 @@
VersionMapper versionMapper;
@Autowired
VersionSensorUnitMapper versionSensorUnitMapper;
+ @Autowired
+ SensorMapper sensorMapper;
@Override
public VersionQueryDTO query(VersionQueryForm form) {
@@ -141,7 +145,7 @@
QueryWrapper<Version> wrapper = new QueryWrapper<>();
wrapper.setEntity(existVersion);
Version existVersionResult = versionMapper.selectOne(wrapper);
- if(!ObjectUtils.isEmpty(existVersionResult)){
+ if (!ObjectUtils.isEmpty(existVersionResult)) {
dto.setCode(ResponseCodeEnum.VERSION_EXIST.getCode());
dto.setMsg(ResponseCodeEnum.VERSION_EXIST.getMsg());
return dto;
@@ -170,9 +174,9 @@
versionMapper.updateById(deleteVersion);
//������������������������������������
UpdateWrapper deleteSensorUnitWrapper = new UpdateWrapper();
- deleteSensorUnitWrapper.eq("version_id",id);
- deleteSensorUnitWrapper.set("is_delete",Constants.DELETE);
- versionSensorUnitMapper.update(null,deleteSensorUnitWrapper);
+ deleteSensorUnitWrapper.eq("version_id", id);
+ deleteSensorUnitWrapper.set("is_delete", Constants.DELETE);
+ versionSensorUnitMapper.update(null, deleteSensorUnitWrapper);
//������������������
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
@@ -180,7 +184,81 @@
}
@Override
+ @Transactional
public VersionDTO updateSensorUnits(VersionSensorUnitForm form) {
- return null;
+ //������������������
+ VersionDTO dto = new VersionDTO();
+ //������
+ 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);
+ versionSensorUnitMapper.insert(sensorUnit);
+ }
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
}
+
+ @Override
+ public VersionQueryDTO queryVersionById(VersionQueryByIdForm form) {
+ //������������������
+ VersionQueryDTO dto = new VersionQueryDTO();
+ //������
+ Integer id = form.getId();
+ Integer size = form.getSize();
+ Integer page = form.getPage();
+ //������������������������������������
+ List<Integer> versionsIds = new ArrayList<>();
+ versionsIds.add(id);
+ List<Version> versions = new ArrayList<>();
+ versions = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
+ //������������������������������������
+ Version version = versions.get(0);
+ List<Sensor> querySensors = version.getSensors();
+ if (!ObjectUtils.isEmpty(querySensors)) {
+ int startIndex = (page - 1) * size;
+ int endIndex = startIndex + size - 1;
+ List<Sensor> resultSensors = new ArrayList<>();
+
+ for (int i = startIndex; i <= endIndex; i++) {
+ if (i >= querySensors.size())
+ break;
+ resultSensors.add(querySensors.get(i));
+ }
+ version.setSensors(resultSensors);
+ }
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ 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