From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 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..dd7f7b1 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,6 +1,7 @@
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.User;
@@ -10,9 +11,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 +23,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 +80,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());
@@ -156,4 +153,53 @@
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;
+ }
}
--
Gitblit v1.8.0