From 7537e950c29dd68a34f16cf1e841fa548c89d58d Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 20 May 2021 13:10:38 +0800 Subject: [PATCH] screen-manage 型号更新以及增加功能完成 --- screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 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 dc1d8f1..97ba19e 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 @@ -10,14 +10,18 @@ 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.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; @@ -54,6 +58,7 @@ 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<>(); @@ -67,6 +72,11 @@ 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); List<Version> versions = versionsPage.getRecords(); @@ -89,4 +99,61 @@ 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; + } + + //������ + 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; + } } -- Gitblit v1.8.0