diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java index 4c38adc5..4e2d8107 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.Set; /** * @author Zheng Jie @@ -80,10 +81,10 @@ public class DictController { @Log("删除字典") @ApiOperation("删除字典") - @DeleteMapping(value = "/{id}") + @DeleteMapping @PreAuthorize("@el.check('dict:del')") - public ResponseEntity delete(@PathVariable Long id){ - dictService.delete(id); + public ResponseEntity delete(@RequestBody Set ids){ + dictService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java index 82db54a2..35dcb959 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; import java.util.Map; +import java.util.Set; /** * @author Zheng Jie @@ -53,9 +54,9 @@ public interface DictService { /** * 删除 - * @param id / + * @param ids / */ - void delete(Long id); + void delete(Set ids); /** * 导出数据 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index b5fc87f1..3e996e95 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -23,10 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author Zheng Jie @@ -87,8 +84,10 @@ public class DictServiceImpl implements DictService { @Override @CacheEvict(allEntries = true) @Transactional(rollbackFor = Exception.class) - public void delete(Long id) { - dictRepository.deleteById(id); + public void delete(Set ids) { + for (Long id : ids) { + dictRepository.deleteById(id); + } } @Override