From 4b370a6da4edbce7885475e1af14358a36e4c223 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Fri, 5 May 2023 17:40:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8(?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7)=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/sys/controller/DictController.java |  7 +++--
 .../adc/da/sys/service/DictServiceImpl.java   | 28 +++++++++----------
 .../da/sys/service/iservice/IDictService.java |  4 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictController.java
index 18d8913..d362bcf 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictController.java
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 
 /**
@@ -48,9 +49,9 @@ public class DictController {
      * 删除一个字典
      */
     @ApiOperation(value = "删除数据字典")
-    @DeleteMapping("/{id}")
-    public ResponseMessage delete(@PathVariable String id) {
-        return dictService.delete(id);
+    @DeleteMapping("/delete")
+    public ResponseMessage delete(@RequestParam("ids") List<String> ids) {
+        return dictService.delete(ids);
     }
 
     /**
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/DictServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/DictServiceImpl.java
index e90eed0..5d159ae 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/DictServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/DictServiceImpl.java
@@ -18,8 +18,10 @@ import com.adc.da.sys.service.iservice.IDictService;
 import com.adc.da.sys.dao.mysql.DictDao;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -71,20 +73,18 @@ public class DictServiceImpl extends ServiceImpl<DictDao, DictEntity>
     }
 
     @Override
-    public ResponseMessage delete(String id) {
-        DictEntity entity = getById(id);
-        if (entity == null) {
-            return Result.error("字典不存在");
-        }
-
-        DictEntity dictEntity = new DictEntity();
-        dictEntity.setId(id);
-        dictEntity.setUpdateTime(new Date());
-        dictEntity.setDelFlag(1);
-        if (updateById(dictEntity)) {
-            return Result.success("删除成功");
-        }
-        return Result.error("删除失败");
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseMessage delete(List<String> ids) {
+        List<DictEntity> dictEntities = new ArrayList<>();
+        ids.forEach(id -> {
+            DictEntity dictEntity = new DictEntity();
+            dictEntity.setId(id);
+            dictEntity.setUpdateTime(new Date());
+            dictEntity.setDelFlag(1);
+            dictEntities.add(dictEntity);
+        });
+        updateBatchById(dictEntities);
+        return Result.success("删除成功");
     }
 
     @Override
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictService.java
index 35bbe91..b3970ce 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IDictService.java
@@ -7,6 +7,8 @@ import com.adc.da.sys.vo.DictVo;
 import com.adc.da.util.http.ResponseMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 
 /**
 * @author ThinkBook
@@ -36,7 +38,7 @@ public interface IDictService extends IService<DictEntity> {
      * @param id
      * @return
      */
-    ResponseMessage delete(String id);
+    ResponseMessage delete(List<String> id);
 
     /**
      * 新增字典