diff --git a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java index c0f9a681..7494ab36 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/controller/GenController.java @@ -99,12 +99,12 @@ public class GenController { * 删除表结构 * * @author fzr - * @param id 主键 + * @param genParam 参数 * @return Object */ @PostMapping("/deleteTable") - public Object deleteTable(@Validated @IDMust() @RequestParam("id") Integer id) { - iGenerateService.deleteTable(id); + public Object deleteTable(@Validated(value = GenParam.delete.class) @RequestBody GenParam genParam) { + iGenerateService.deleteTable(genParam.getIds()); return AjaxResult.success(); } diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java index 4857fd86..88e5bc9f 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/IGenerateService.java @@ -6,6 +6,7 @@ import com.hxkj.generator.validate.PageParam; import com.hxkj.generator.vo.DbTableVo; import com.hxkj.generator.vo.GenTableVo; +import java.util.List; import java.util.Map; /** @@ -61,10 +62,10 @@ public interface IGenerateService { /** * 删除表结构 * - * @param id 主键 + * @param ids 主键 * @author fzr */ - void deleteTable(Integer id); + void deleteTable(List ids); /** * 同步数据表 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index 95fa8f91..b8a10b7b 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -264,16 +264,15 @@ public class GenerateServiceImpl implements IGenerateService { * 删除表结构 * * @author fzr - * @param id 主键 + * @param ids 主键 */ @Override @Transactional - public void deleteTable(Integer id) { - GenTable genTable = genTableMapper.selectById(id); - Assert.notNull(genTable, "数据已丢失"); - - genTableMapper.deleteById(id); - genTableColumnMapper.delete(new QueryWrapper().eq("table_id", id)); + public void deleteTable(List ids) { + for (Integer id : ids) { + genTableMapper.deleteById(id); + genTableColumnMapper.delete(new QueryWrapper().eq("table_id" , id)); + } } /** diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index 8046b4bd..5501dd1a 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -23,9 +23,14 @@ import java.util.Map; @Accessors(chain = true) public class GenParam implements Serializable { + public interface delete{} + @IDMust(message = "id参数必传且需大于0") private Integer id; + @NotNull(message = "ids参数缺失", groups = {delete.class}) + private List ids; + @NotNull(message = "tableName参数缺失") @NotEmpty(message = "表名称不能为空") @Length(min = 1, max = 200, message = "名称不能大于200个字符")