From 465c4e57b9bd0cf7692b951df0f17ca697b71e4b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 12 May 2021 13:40:52 +0800
Subject: [PATCH] screen-manage                   增加单位转换模块删除功能

---
 screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java               |   15 +++++++
 screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java            |   27 +++++++++++++
 screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java                     |   10 +++++
 screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionDeleteForm.java |   23 +++++++++++
 4 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java b/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java
index 8d75c25..4367a06 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/UnitConversionController.java
@@ -2,6 +2,7 @@
 
 import com.moral.api.pojo.dto.unitConversion.UnitConversionDTO;
 import com.moral.api.pojo.dto.unitConversion.UnitConversionQueryDTO;
+import com.moral.api.pojo.form.unitConversion.UnitConversionDeleteForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm;
@@ -73,4 +74,18 @@
 
         return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
+
+    @PostMapping("delete")
+    public ResultMessage delete(@RequestBody UnitConversionDeleteForm form){
+
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        //������������������
+        UnitConversionDTO dto = unitConversionService.deleteUnitConversion(form);
+
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
+    }
 }
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionDeleteForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionDeleteForm.java
new file mode 100644
index 0000000..e68c118
--- /dev/null
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionDeleteForm.java
@@ -0,0 +1,23 @@
+package com.moral.api.pojo.form.unitConversion;
+
+import lombok.Data;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * @ClassName UnitConversionDeleteForm
+ * @Description TODO
+ * @Author ���������
+ * @Date 2021/5/12 13:17
+ * @Version TODO
+ **/
+@Data
+public class UnitConversionDeleteForm {
+
+    private Integer id;
+
+    public boolean valid(){
+        if(ObjectUtils.isEmpty(id))
+            return false;
+        return true;
+    }
+}
diff --git a/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java b/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java
index ed33a55..4da67ea 100644
--- a/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/UnitConversionService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.moral.api.pojo.dto.unitConversion.UnitConversionDTO;
 import com.moral.api.pojo.dto.unitConversion.UnitConversionQueryDTO;
+import com.moral.api.pojo.form.unitConversion.UnitConversionDeleteForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm;
@@ -45,4 +46,13 @@
             */
     UnitConversionDTO updateUnitConversion(UnitConversionUpdateForm form);
 
+    /**
+    * @Description: ������������������������
+            * @Param: [form]
+            * @return: com.moral.api.pojo.dto.unitConversion.UnitConversionDTO
+            * @Author: ���������
+            * @Date: 2021/5/12
+            */
+    UnitConversionDTO deleteUnitConversion(UnitConversionDeleteForm form);
+
 }
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
index ca6a3ee..5075715 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/UnitConversionServiceImpl.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.SysDictData;
@@ -8,6 +9,7 @@
 import com.moral.api.mapper.UnitConversionMapper;
 import com.moral.api.pojo.dto.unitConversion.UnitConversionDTO;
 import com.moral.api.pojo.dto.unitConversion.UnitConversionQueryDTO;
+import com.moral.api.pojo.form.unitConversion.UnitConversionDeleteForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionInsertForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionQueryForm;
 import com.moral.api.pojo.form.unitConversion.UnitConversionUpdateForm;
@@ -135,6 +137,7 @@
         UnitConversion oldUnitConversion = new UnitConversion();
         oldUnitConversion.setId(unitConversion.getId());
         oldUnitConversion.setIsDelete(Constants.NOT_DELETE);
+        oldWrapper.setEntity(oldUnitConversion);
         oldUnitConversion = unitConversionMapper.selectOne(oldWrapper);
         //������
         unitConversionMapper.updateById(unitConversion);
@@ -143,4 +146,28 @@
         dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
         return dto;
     }
+
+    @Override
+    public UnitConversionDTO deleteUnitConversion(UnitConversionDeleteForm form) {
+        //������������������
+        UnitConversionDTO dto = new UnitConversionDTO();
+        //������
+        Integer id = form.getId();
+        //������������������������������������������
+        QueryWrapper<UnitConversion> oldWrapper = new QueryWrapper<>();
+        UnitConversion oldUnitConversion = new UnitConversion();
+        oldUnitConversion.setId(id);
+        oldUnitConversion.setIsDelete(Constants.NOT_DELETE);
+        oldWrapper.setEntity(oldUnitConversion);
+        oldUnitConversion = unitConversionMapper.selectOne(oldWrapper);
+        //������������������
+        UpdateWrapper deleteWrapper = new UpdateWrapper();
+        deleteWrapper.set("is_delete",Constants.DELETE);
+        deleteWrapper.eq("id",id);
+        unitConversionMapper.update(null,deleteWrapper);
+        //������������������
+        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+        return dto;
+    }
 }

--
Gitblit v1.8.0