diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategory.java b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategory.java index 9952f48..813cacf 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategory.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/domain/ArticleCategory.java @@ -4,9 +4,12 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.TreeEntity; import com.ruoyi.common.core.interfaces.LogBizParam; +import com.ruoyi.common.core.validate.ValidGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * 文章分类对象 bst_article_category * @@ -22,12 +25,19 @@ public class ArticleCategory extends TreeEntity implements LogBizParam @Excel(name = "分类名称") @ApiModelProperty("分类名称") + @NotBlank(message = "分类名称不能为空", groups = {ValidGroup.Create.class}) private String categoryName; @Excel(name = "状态:0-禁用 1-启用") @ApiModelProperty("状态:0-禁用 1-启用") + @NotBlank(message = "状态不能为空", groups = {ValidGroup.Create.class}) private String categoryStatus; + @Excel(name = "类型:1-其他 2-商户帮助中心") + @ApiModelProperty("类型:1-其他 2-商户帮助中心") + @NotBlank(message = "文章类型不能为空", groups = {ValidGroup.Create.class}) + private String type; + @Excel(name = "父分类ID") @ApiModelProperty("父分类ID") private Long parentId; diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml index ea3d738..1d5b710 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/articleCategory/mapper/ArticleCategoryMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bac.parent_id, bac.category_status, bac.sort, + bac.type, bac.create_time from bst_article_category bac @@ -30,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bac.parent_id = #{query.parentId} and bac.category_status = #{query.categoryStatus} and bac.sort = #{query.sort} + and bac.type = #{query.type} ${query.params.dataScope} @@ -68,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" category_status, sort, create_time, + type, #{categoryName}, @@ -75,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{categoryStatus}, #{sort}, #{createTime}, + #{type}, @@ -188,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" category_status = #{data.categoryStatus}, sort = #{data.sort}, create_time = #{data.createTime}, + type = #{data.type}, diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java index 1c30c71..522143a 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java @@ -4,8 +4,10 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.core.validate.ValidGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -80,7 +82,7 @@ public class ArticleCategoryController extends BaseController @PreAuthorize("@ss.hasPermi('bst:articleCategory:add')") @Log(title = "新增文章分类", businessType = BusinessType.INSERT, bizIdName = "arg0", bizType = LogBizType.ARTICLE_CATEGORY) @PostMapping - public AjaxResult add(@RequestBody ArticleCategory articleCategory ) + public AjaxResult add(@RequestBody @Validated(ValidGroup.Create.class) ArticleCategory articleCategory ) { return toAjax(articleCategoryService.insertArticleCategory(articleCategory)); } @@ -93,7 +95,7 @@ public class ArticleCategoryController extends BaseController @PreAuthorize("@ss.hasPermi('bst:articleCategory:edit')") @Log(title = "修改文章分类", businessType = BusinessType.UPDATE, bizIdName = "arg0", bizType = LogBizType.ARTICLE_CATEGORY) @PutMapping - public AjaxResult edit(@RequestBody ArticleCategory articleCategory) + public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) ArticleCategory articleCategory) { return toAjax(articleCategoryService.updateArticleCategory(articleCategory)); }