From ff6b19e6257fad8f884ad2010bbe9ffd3a8255d5 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 10 Aug 2022 09:22:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/article/ArticleController.java | 26 ++++++------ .../article/CategoryController.java | 26 ++++++------ .../article/IArticleArchivesService.java | 10 ++--- .../article/IArticleCategoryService.java | 10 ++--- .../impl/ArticleArchivesServiceImpl.java | 42 +++++++++---------- .../impl/ArticleCategoryServiceImpl.java | 22 +++++----- ...tegoryParam.java => ArticleCateParam.java} | 4 +- ...leArchivesParam.java => ArticleParam.java} | 2 +- 8 files changed, 71 insertions(+), 71 deletions(-) rename server/like-admin/src/main/java/com/hxkj/admin/validate/article/{ArticleCategoryParam.java => ArticleCateParam.java} (91%) rename server/like-admin/src/main/java/com/hxkj/admin/validate/article/{ArticleArchivesParam.java => ArticleParam.java} (97%) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java index 2494af49..278c8746 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java @@ -2,7 +2,7 @@ package com.hxkj.admin.controller.article; import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.service.article.IArticleArchivesService; -import com.hxkj.admin.validate.article.ArticleArchivesParam; +import com.hxkj.admin.validate.article.ArticleParam; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.common.article.ArticleDetailVo; import com.hxkj.admin.vo.common.article.ArticleListVo; @@ -57,15 +57,15 @@ public class ArticleController { * 文章新增 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 * @return Object */ @Log(title = "文章新增") @PostMapping("/add") public Object add( - @Validated(value = ArticleArchivesParam.create.class) - @RequestBody ArticleArchivesParam articleArchivesParam) { - iArticleArchivesService.add(articleArchivesParam); + @Validated(value = ArticleParam.create.class) + @RequestBody ArticleParam articleParam) { + iArticleArchivesService.add(articleParam); return AjaxResult.success(); } @@ -73,14 +73,14 @@ public class ArticleController { * 文章编辑 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 * @return Object */ @Log(title = "文章编辑") @PostMapping("/edit") - public Object edit(@Validated(value = ArticleArchivesParam.update.class) - @RequestBody ArticleArchivesParam articleArchivesParam) { - iArticleArchivesService.edit(articleArchivesParam); + public Object edit(@Validated(value = ArticleParam.update.class) + @RequestBody ArticleParam articleParam) { + iArticleArchivesService.edit(articleParam); return AjaxResult.success(); } @@ -88,14 +88,14 @@ public class ArticleController { * 文章删除 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 * @return Object */ @Log(title = "文章删除") @PostMapping("/del") - public Object del(@Validated(value = ArticleArchivesParam.delete.class) - @RequestBody ArticleArchivesParam articleArchivesParam) { - iArticleArchivesService.del(articleArchivesParam.getId()); + public Object del(@Validated(value = ArticleParam.delete.class) + @RequestBody ArticleParam articleParam) { + iArticleArchivesService.del(articleParam.getId()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java index ef64ff31..5af9b2d2 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java @@ -2,7 +2,7 @@ package com.hxkj.admin.controller.article; import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.service.article.IArticleCategoryService; -import com.hxkj.admin.validate.article.ArticleCategoryParam; +import com.hxkj.admin.validate.article.ArticleCateParam; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.common.article.ArticleCateVo; import com.hxkj.common.core.AjaxResult; @@ -69,14 +69,14 @@ public class CategoryController { * 分类新增 * * @author fzr - * @param articleCategoryParam 分类参数 + * @param articleCateParam 分类参数 * @return Object */ @Log(title = "文章分类新增") @PostMapping("/add") - public Object add(@Validated(value = ArticleCategoryParam.create.class) - @RequestBody ArticleCategoryParam articleCategoryParam) { - iArticleCategoryService.add(articleCategoryParam); + public Object add(@Validated(value = ArticleCateParam.create.class) + @RequestBody ArticleCateParam articleCateParam) { + iArticleCategoryService.add(articleCateParam); return AjaxResult.success(); } @@ -84,14 +84,14 @@ public class CategoryController { * 分类编辑 * * @author fzr - * @param articleCategoryParam 分类编辑 + * @param articleCateParam 分类编辑 * @return Object */ @Log(title = "文章分类编辑") @PostMapping("/edit") - public Object edit(@Validated(value = ArticleCategoryParam.update.class) - @RequestBody ArticleCategoryParam articleCategoryParam) { - iArticleCategoryService.edit(articleCategoryParam); + public Object edit(@Validated(value = ArticleCateParam.update.class) + @RequestBody ArticleCateParam articleCateParam) { + iArticleCategoryService.edit(articleCateParam); return AjaxResult.success(); } @@ -99,14 +99,14 @@ public class CategoryController { * 分类删除 * * @author fzr - * @param articleCategoryParam 分类删除 + * @param articleCateParam 分类删除 * @return Object */ @Log(title = "文章分类删除") @PostMapping("/cateDel") - public Object del(@Validated(value = ArticleCategoryParam.delete.class) - @RequestBody ArticleCategoryParam articleCategoryParam) { - iArticleCategoryService.del(articleCategoryParam.getId()); + public Object del(@Validated(value = ArticleCateParam.delete.class) + @RequestBody ArticleCateParam articleCateParam) { + iArticleCategoryService.del(articleCateParam.getId()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java index b89d2927..1c65f119 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java @@ -1,6 +1,6 @@ package com.hxkj.admin.service.article; -import com.hxkj.admin.validate.article.ArticleArchivesParam; +import com.hxkj.admin.validate.article.ArticleParam; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.common.article.ArticleDetailVo; import com.hxkj.admin.vo.common.article.ArticleListVo; @@ -35,17 +35,17 @@ public interface IArticleArchivesService { * 文章新增 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 */ - void add(ArticleArchivesParam articleArchivesParam); + void add(ArticleParam articleParam); /** * 文章编辑 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 */ - void edit(ArticleArchivesParam articleArchivesParam); + void edit(ArticleParam articleParam); /** * 文章删除 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java index ecb9ac8f..07164198 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java @@ -1,6 +1,6 @@ package com.hxkj.admin.service.article; -import com.hxkj.admin.validate.article.ArticleCategoryParam; +import com.hxkj.admin.validate.article.ArticleCateParam; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.common.article.ArticleCateVo; import com.hxkj.common.core.PageResult; @@ -43,17 +43,17 @@ public interface IArticleCategoryService { * 分类新增 * * @author fzr - * @param articleCategoryParam 分类参数 + * @param articleCateParam 分类参数 */ - void add(ArticleCategoryParam articleCategoryParam); + void add(ArticleCateParam articleCateParam); /** * 分类编辑 * * @author fzr - * @param articleCategoryParam 分类参数 + * @param articleCateParam 分类参数 */ - void edit(ArticleCategoryParam articleCategoryParam); + void edit(ArticleCateParam articleCateParam); /** * 分类删除 diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.java index cf01f46e..dcdcd5f1 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; import com.hxkj.admin.service.article.IArticleArchivesService; -import com.hxkj.admin.validate.article.ArticleArchivesParam; +import com.hxkj.admin.validate.article.ArticleParam; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.common.article.ArticleDetailVo; import com.hxkj.admin.vo.common.article.ArticleListVo; @@ -111,18 +111,18 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { * 文章新增 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 */ @Override - public void add(ArticleArchivesParam articleArchivesParam) { + public void add(ArticleParam articleParam) { Article model = new Article(); - model.setCid(articleArchivesParam.getCid()); - model.setTitle(articleArchivesParam.getTitle()); - model.setImage(UrlUtil.toRelativeUrl(articleArchivesParam.getImage())); - model.setIntro(articleArchivesParam.getIntro()); - model.setContent(articleArchivesParam.getContent()); - model.setSort(articleArchivesParam.getSort()); - model.setIsShow(articleArchivesParam.getIsShow()); + model.setCid(articleParam.getCid()); + model.setTitle(articleParam.getTitle()); + model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage())); + model.setIntro(articleParam.getIntro()); + model.setContent(articleParam.getContent()); + model.setSort(articleParam.getSort()); + model.setIsShow(articleParam.getIsShow()); model.setVisit(0); model.setCreateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp()); @@ -133,29 +133,29 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { * 文章编辑 * * @author fzr - * @param articleArchivesParam 文章参数 + * @param articleParam 文章参数 */ @Override - public void edit(ArticleArchivesParam articleArchivesParam) { + public void edit(ArticleParam articleParam) { Article model = articleMapper.selectOne( new QueryWrapper
() - .eq("id", articleArchivesParam.getId()) + .eq("id", articleParam.getId()) .eq("is_delete", 0)); Assert.notNull(model, "文章不存在!"); Assert.notNull(articleCategoryMapper.selectOne( new QueryWrapper() - .eq("id", articleArchivesParam.getCid()) + .eq("id", articleParam.getCid()) .eq("is_delete", 0)), "分类不存在"); - model.setCid(articleArchivesParam.getCid()); - model.setTitle(articleArchivesParam.getTitle()); - model.setImage(UrlUtil.toRelativeUrl(articleArchivesParam.getImage())); - model.setIntro(articleArchivesParam.getIntro()); - model.setContent(articleArchivesParam.getContent()); - model.setIsShow(articleArchivesParam.getIsShow()); - model.setSort(articleArchivesParam.getSort()); + model.setCid(articleParam.getCid()); + model.setTitle(articleParam.getTitle()); + model.setImage(UrlUtil.toRelativeUrl(articleParam.getImage())); + model.setIntro(articleParam.getIntro()); + model.setContent(articleParam.getContent()); + model.setIsShow(articleParam.getIsShow()); + model.setSort(articleParam.getSort()); model.setUpdateTime(TimeUtil.timestamp()); articleMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java index 88000586..085191a0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hxkj.admin.service.article.IArticleCategoryService; -import com.hxkj.admin.validate.article.ArticleCategoryParam; +import com.hxkj.admin.validate.article.ArticleCateParam; import com.hxkj.admin.validate.common.PageParam; import com.hxkj.admin.vo.common.article.ArticleCateVo; import com.hxkj.common.core.PageResult; @@ -123,14 +123,14 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { * 分类新增 * * @author fzr - * @param articleCategoryParam 分类参数 + * @param articleCateParam 分类参数 */ @Override - public void add(ArticleCategoryParam articleCategoryParam) { + public void add(ArticleCateParam articleCateParam) { ArticleCategory model = new ArticleCategory(); - model.setId(articleCategoryParam.getId()); - model.setName(articleCategoryParam.getName()); - model.setSort(articleCategoryParam.getSort()); + model.setId(articleCateParam.getId()); + model.setName(articleCateParam.getName()); + model.setSort(articleCateParam.getSort()); model.setCreateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp()); articleCategoryMapper.insert(model); @@ -140,22 +140,22 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { * 文章编辑 * * @author fzr - * @param articleCategoryParam 分类参数 + * @param articleCateParam 分类参数 */ @Override - public void edit(ArticleCategoryParam articleCategoryParam) { + public void edit(ArticleCateParam articleCateParam) { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")) - .eq("id", articleCategoryParam.getId()) + .eq("id", articleCateParam.getId()) .eq("is_delete", 0)); Assert.notNull(model, "分类不存在"); - model.setName(articleCategoryParam.getName()); - model.setSort(articleCategoryParam.getSort()); + model.setName(articleCateParam.getName()); + model.setSort(articleCateParam.getSort()); model.setUpdateTime(TimeUtil.timestamp()); articleCategoryMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCategoryParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCategoryParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java index ae5cb1da..48d389c5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCategoryParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class ArticleCategoryParam implements Serializable { +public class ArticleCateParam implements Serializable { private static final long serialVersionUID = 1L; @@ -26,7 +26,7 @@ public class ArticleCategoryParam implements Serializable { public interface update{} public interface delete{} - @IDMust(message = "id参数必传且需大于0", groups = {ArticleArchivesParam.create.class, ArticleArchivesParam.delete.class}) + @IDMust(message = "id参数必传且需大于0", groups = {ArticleParam.create.class, ArticleParam.delete.class}) private Integer id; @NotEmpty(message = "分类名称不能为空", groups = {create.class, update.class}) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleArchivesParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java similarity index 97% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleArchivesParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java index 89aa332a..f5693ef4 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleArchivesParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class ArticleArchivesParam implements Serializable { +public class ArticleParam implements Serializable { private static final long serialVersionUID = 1L;