diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ApiGroupRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ApiGroupRequest.java index a8d0b295c..2c5aae66f 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ApiGroupRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/ApiGroupRequest.java @@ -4,8 +4,10 @@ import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.List; /** * 接口分组封装类 @@ -46,6 +48,10 @@ public class ApiGroupRequest extends BaseRequest { @NotNull(message = "分组名称不能为空", groups = {add.class, edit.class}) private java.math.BigDecimal groupSort; + @Valid + @NotNull(message = "分组名称不能为空", groups = {treeSort.class}) + private List treeSortRequestList; + /** * 创建时间 */ @@ -66,4 +72,10 @@ public class ApiGroupRequest extends BaseRequest { */ private Long updateUser; + /** + * 树排序 + */ + public @interface treeSort { + + } } \ No newline at end of file diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/TreeSortRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/TreeSortRequest.java index 5bc7574ca..8f41f6d58 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/TreeSortRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/resource/TreeSortRequest.java @@ -45,4 +45,11 @@ public class TreeSortRequest extends BaseRequest { @ChineseDescription("节点排序") @NotNull(message = "节点排序不能为空", groups = {edit.class}) private BigDecimal nodeSort; + + /** + * 树排序 + */ + public @interface treeSort { + + } } diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiGroupController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiGroupController.java index 081a5c198..eda36db04 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiGroupController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiGroupController.java @@ -71,8 +71,8 @@ public class ApiGroupController { * @date 2021/05/21 15:03 */ @PostResource(name = "编辑树节点排序", path = "/apiGroup/editTreeSort") - public ResponseData editTreeSort(@RequestBody @Validated(TreeSortRequest.edit.class) List treeSortRequestList) { - apiGroupService.editTreeSort(treeSortRequestList); + public ResponseData editTreeSort(@RequestBody @Validated(ApiGroupRequest.treeSort.class) ApiGroupRequest apiGroupRequest) { + apiGroupService.editTreeSort(apiGroupRequest.getTreeSortRequestList()); return new SuccessResponseData(); }