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 | 203 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 193 insertions(+), 10 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 c716f2e..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
@@ -1,26 +1,31 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
import com.moral.api.pojo.dto.version.VersionQueryDTO;
-import com.moral.api.pojo.form.version.VersionQueryForm;
+import com.moral.api.pojo.form.version.*;
import com.moral.api.service.VersionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
+import org.apache.tomcat.websocket.WsRemoteEndpointAsync;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* <p>
@@ -37,6 +42,8 @@
VersionMapper versionMapper;
@Autowired
VersionSensorUnitMapper versionSensorUnitMapper;
+ @Autowired
+ SensorMapper sensorMapper;
@Override
public VersionQueryDTO query(VersionQueryForm form) {
@@ -52,10 +59,11 @@
Date updateEndTime = form.getUpdateEndTime();
String order = form.getOrder();
String orderType = form.getOrderType();
+ Integer isDelete = form.getIsDelete();
//������������������
Page<Version> queryPage = new Page<>(page, size);
NullFilterWrapper<Version> wrapper = new NullFilterWrapper<>();
- wrapper.like("name",name);
+ wrapper.like("name", name);
wrapper.between("create_time", createStartTime, createEndTime);
wrapper.between("update_time", updateStartTime, updateEndTime);
//������������������������
@@ -65,17 +73,192 @@
else
wrapper.orderByDesc(ConvertUtils.toLine(order));
}
+ //������������������������
+ if (!ObjectUtils.isEmpty(isDelete))
+ wrapper.eq("is_delete", isDelete);
+ else
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
//������������
- Page<Version> versionsPage = versionMapper.selectPage(queryPage,wrapper);
+ Page<Version> versionsPage = versionMapper.selectPage(queryPage, wrapper);
List<Version> versions = versionsPage.getRecords();
//������������������������������������
List<Integer> versionsIds = new ArrayList<>();
- versions.forEach(value->versionsIds.add(value.getId()));
- if(!ObjectUtils.isEmpty(versionsIds)){
- QueryWrapper<VersionSensorUnit> sensorUnitQueryWrapper = new QueryWrapper<>();
+ versions.forEach(value -> versionsIds.add(value.getId()));
+ List<Version> queryResult = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(versionsIds)) {
+ queryResult = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
+ }
+ //������������������
+ List<VersionDTO> dtos = new ArrayList<>();
+ queryResult.forEach(value -> dtos.add(new VersionDTO(value)));
+ dto.setVersionDTOS(dtos);
+ dto.setCurrent(versionsPage.getCurrent());
+ dto.setPages(versionsPage.getPages());
+ dto.setSize(versionsPage.getSize());
+ dto.setTotal(versionsPage.getTotal());
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
+ }
+ @Override
+ @Transactional
+ public VersionDTO update(VersionUpdateForm form) {
+ //������������������
+ VersionDTO dto = new VersionDTO();
+ //������
+ Version version = form.formConvertEntity();
+ //������������������version ������������������
+ QueryWrapper<Version> oldVersionWrapper = new QueryWrapper<>();
+ Version oldVersion = new Version();
+ oldVersion.setId(version.getId());
+ oldVersion.setIsDelete(Constants.NOT_DELETE);
+ oldVersionWrapper.setEntity(oldVersion);
+ oldVersion = versionMapper.selectOne(oldVersionWrapper);
+ if (ObjectUtils.isEmpty(oldVersion)) {
+ dto.setCode(ResponseCodeEnum.VERSION_NOT_EXIST.getCode());
+ dto.setMsg(ResponseCodeEnum.VERSION_NOT_EXIST.getMsg());
+ return dto;
}
- return null;
+ //������
+ versionMapper.updateById(version);
+
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+
+ return dto;
}
+
+ @Override
+ @Transactional
+ public VersionDTO insert(VersionInsertForm form) {
+ //������������������
+ VersionDTO dto = new VersionDTO();
+ //������
+ Version version = form.formConvertEntity();
+ //������������������������������������
+ Version existVersion = new Version();
+ existVersion.setName(version.getName());
+ existVersion.setIsDelete(Constants.NOT_DELETE);
+ QueryWrapper<Version> wrapper = new QueryWrapper<>();
+ wrapper.setEntity(existVersion);
+ Version existVersionResult = versionMapper.selectOne(wrapper);
+ if (!ObjectUtils.isEmpty(existVersionResult)) {
+ dto.setCode(ResponseCodeEnum.VERSION_EXIST.getCode());
+ dto.setMsg(ResponseCodeEnum.VERSION_EXIST.getMsg());
+ return dto;
+ }
+ //������
+ versionMapper.insert(version);
+ //������������������
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
+ }
+
+ @Override
+ @Transactional
+ public VersionDTO delete(VersionDeleteForm form) {
+ //������������������
+ VersionDTO dto = new VersionDTO();
+ //������
+ Integer id = form.getId();
+ //������������������������������������������
+ Version oldVersion = versionMapper.selectById(id);
+ //������������
+ Version deleteVersion = new Version();
+ deleteVersion.setId(oldVersion.getId());
+ deleteVersion.setIsDelete(Constants.DELETE);
+ versionMapper.updateById(deleteVersion);
+ //������������������������������������
+ UpdateWrapper deleteSensorUnitWrapper = new UpdateWrapper();
+ 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());
+ return dto;
+ }
+
+ @Override
+ @Transactional
+ public VersionDTO updateSensorUnits(VersionSensorUnitForm form) {
+ //������������������
+ 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