From 3fa340c5b1ee1aae72260f0a7a885c67c62e4c20 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 17 Aug 2022 11:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/DictDataController.java | 2 +- .../setting/DictTypeController.java | 2 +- .../setting/ISettingDictDataService.java | 4 ++-- .../setting/ISettingDictTypeService.java | 4 ++-- .../impl/SettingDictDataServiceImpl.java | 22 ++++++++----------- .../impl/SettingDictTypeServiceImpl.java | 22 ++++++++----------- .../admin/validate/setting/DictDataParam.java | 6 ++++- .../admin/validate/setting/DictTypeParam.java | 4 ++++ 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java index 0eb282fd..334ccb51 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictDataController.java @@ -103,7 +103,7 @@ public class DictDataController { */ @PostMapping("/del") public Object del(@Validated(value = DictDataParam.delete.class) @RequestBody DictDataParam dictDataParam) { - iSettingDictDataService.del(dictDataParam.getId()); + iSettingDictDataService.del(dictDataParam.getIds()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java index 85310194..ee7d2cfd 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/setting/DictTypeController.java @@ -99,7 +99,7 @@ public class DictTypeController { */ @PostMapping("/del") public Object del(@Validated(value = DictTypeParam.delete.class) @RequestBody DictTypeParam dictTypeParam) { - iSettingDictTypeService.del(dictTypeParam.getId()); + iSettingDictTypeService.del(dictTypeParam.getIds()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java index a6d17027..738bf9dd 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictDataService.java @@ -60,8 +60,8 @@ public interface ISettingDictDataService { * 字典数据删除 * * @author fzr - * @param id 主键 + * @param ids 主键 */ - void del(Integer id); + void del(List ids); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java index 96a83822..08c0db1e 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/ISettingDictTypeService.java @@ -60,8 +60,8 @@ public interface ISettingDictTypeService { * 字典类型删除 * * @author fzr - * @param id 主键 + * @param ids 主键 */ - void del(Integer id); + void del(List ids); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java index 71cc3ad1..9651d4a0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictDataServiceImpl.java @@ -208,21 +208,17 @@ public class SettingDictDataServiceImpl implements ISettingDictDataService { * 字典数据删除 * * @author fzr - * @param id 主键 + * @param ids 主键 */ @Override - public void del(Integer id) { - DictData model = dictDataMapper.selectOne(new QueryWrapper() - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "字典数据不存在！"); - - model.setId(id); - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - dictDataMapper.updateById(model); + public void del(List ids) { + for (Integer id : ids) { + DictData model = new DictData(); + model.setId(id); + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + dictDataMapper.updateById(model); + } } } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java index 3d746af6..0dcb45de 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/setting/impl/SettingDictTypeServiceImpl.java @@ -189,21 +189,17 @@ public class SettingDictTypeServiceImpl implements ISettingDictTypeService { * 字典类型删除 * * @author fzr - * @param id 主键 + * @param ids 主键 */ @Override - public void del(Integer id) { - DictType model = dictTypeMapper.selectOne(new QueryWrapper() - .select("id") - .eq("id", id) - .eq("is_delete", 0) - .last("limit 1")); - - Assert.notNull(model, "字典类型不存在！"); - - model.setIsDelete(1); - model.setDeleteTime(System.currentTimeMillis() / 1000); - dictTypeMapper.updateById(model); + public void del(List ids) { + for(Integer id : ids) { + DictType model = new DictType(); + model.setId(id); + model.setIsDelete(1); + model.setDeleteTime(System.currentTimeMillis() / 1000); + dictTypeMapper.updateById(model); + } } } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictDataParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictDataParam.java index cf3b6942..8f201d97 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictDataParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictDataParam.java @@ -10,6 +10,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * 字典数据参数 @@ -25,9 +26,12 @@ public class DictDataParam implements Serializable { public interface update{} public interface delete{} - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) + @IDMust(message = "id参数必传且需大于0", groups = {update.class}) private Integer id; + @NotNull(message = "ids参数缺失", groups = {DictDataParam.delete.class}) + private List ids; + @IDMust(message = "typeId参数必传且需大于0", groups = {create.class, update.class}) private Integer typeId; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictTypeParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictTypeParam.java index 0801b8e8..b05c5630 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictTypeParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/setting/DictTypeParam.java @@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * 字典类型参数 @@ -27,6 +28,9 @@ public class DictTypeParam implements Serializable { @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) private Integer id; + @NotNull(message = "ids参数缺失", groups = {DictDataParam.delete.class}) + private List ids; + @NotNull(message = "dictName参数缺失", groups = {create.class, update.class}) @Length(max = 200, message = "名称不能超出200个字符", groups = {create.class, update.class}) private String dictName;