From 3c5d56e7e0d210a3da957ada38ae35b44a4c9170 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 17 Jun 2021 13:52:16 +0800
Subject: [PATCH] 因子模糊查询修改bug
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 107 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 97ba19e..d81b12f 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,8 +1,10 @@
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;
@@ -10,9 +12,7 @@
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.VersionInsertForm;
-import com.moral.api.pojo.form.version.VersionQueryForm;
-import com.moral.api.pojo.form.version.VersionUpdateForm;
+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;
@@ -24,9 +24,7 @@
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>
@@ -83,13 +81,13 @@
//������������������������������������
List<Integer> versionsIds = new ArrayList<>();
versions.forEach(value -> versionsIds.add(value.getId()));
- List<Version> result = new ArrayList<>();
+ List<Version> queryResult = new ArrayList<>();
if (!ObjectUtils.isEmpty(versionsIds)) {
- result = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
+ queryResult = versionMapper.queryVersionsAndSensorUnitByIds(versionsIds);
}
//������������������
List<VersionDTO> dtos = new ArrayList<>();
- result.forEach(value -> dtos.add(new VersionDTO(value)));
+ queryResult.forEach(value -> dtos.add(new VersionDTO(value)));
dto.setVersionDTOS(dtos);
dto.setCurrent(versionsPage.getCurrent());
dto.setPages(versionsPage.getPages());
@@ -144,7 +142,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;
@@ -156,4 +154,103 @@
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);
+ //���������������������������������
+ 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