From b317402b5afe594dcedabbb793b97a11b609fa6a Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 10 Aug 2022 09:43:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/article/ArticleController.java | 4 +-- .../article/CategoryController.java | 28 +++++++++---------- .../controller/common/AlbumController.java | 2 +- .../article/IArticleArchivesService.java | 4 +-- .../article/IArticleCategoryService.java | 12 ++++---- .../impl/ArticleArchivesServiceImpl.java | 4 +-- .../impl/ArticleCategoryServiceImpl.java | 24 ++++++++-------- .../admin/service/common/IAlbumService.java | 2 +- .../service/common/impl/AlbumServiceImpl.java | 4 +-- ...ticleCateParam.java => CategoryParam.java} | 2 +- .../admin/validate/common/AlbumParam.java | 3 ++ .../vo/{common => }/album/AlbumCateVo.java | 2 +- .../admin/vo/{common => }/album/AlbumVo.java | 2 +- .../{common => }/article/ArticleCateVo.java | 2 +- .../{common => }/article/ArticleDetailVo.java | 2 +- .../{common => }/article/ArticleListVo.java | 2 +- 16 files changed, 51 insertions(+), 48 deletions(-) rename server/like-admin/src/main/java/com/hxkj/admin/validate/article/{ArticleCateParam.java => CategoryParam.java} (96%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{common => }/album/AlbumCateVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{common => }/album/AlbumVo.java (93%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{common => }/article/ArticleCateVo.java (91%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{common => }/article/ArticleDetailVo.java (94%) rename server/like-admin/src/main/java/com/hxkj/admin/vo/{common => }/article/ArticleListVo.java (93%) 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 278c8746..a523612f 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 @@ -4,8 +4,8 @@ import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.service.article.IArticleArchivesService; 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; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; 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 5af9b2d2..74935f5c 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,9 +2,9 @@ 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.ArticleCateParam; +import com.hxkj.admin.validate.article.CategoryParam; import com.hxkj.admin.validate.common.PageParam; -import com.hxkj.admin.vo.common.article.ArticleCateVo; +import com.hxkj.admin.vo.article.ArticleCateVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.validator.annotation.IDMust; @@ -69,14 +69,14 @@ public class CategoryController { * 分类新增 * * @author fzr - * @param articleCateParam 分类参数 + * @param categoryParam 分类参数 * @return Object */ @Log(title = "文章分类新增") @PostMapping("/add") - public Object add(@Validated(value = ArticleCateParam.create.class) - @RequestBody ArticleCateParam articleCateParam) { - iArticleCategoryService.add(articleCateParam); + public Object add(@Validated(value = CategoryParam.create.class) + @RequestBody CategoryParam categoryParam) { + iArticleCategoryService.add(categoryParam); return AjaxResult.success(); } @@ -84,14 +84,14 @@ public class CategoryController { * 分类编辑 * * @author fzr - * @param articleCateParam 分类编辑 + * @param categoryParam 分类编辑 * @return Object */ @Log(title = "文章分类编辑") @PostMapping("/edit") - public Object edit(@Validated(value = ArticleCateParam.update.class) - @RequestBody ArticleCateParam articleCateParam) { - iArticleCategoryService.edit(articleCateParam); + public Object edit(@Validated(value = CategoryParam.update.class) + @RequestBody CategoryParam categoryParam) { + iArticleCategoryService.edit(categoryParam); return AjaxResult.success(); } @@ -99,14 +99,14 @@ public class CategoryController { * 分类删除 * * @author fzr - * @param articleCateParam 分类删除 + * @param categoryParam 分类删除 * @return Object */ @Log(title = "文章分类删除") @PostMapping("/cateDel") - public Object del(@Validated(value = ArticleCateParam.delete.class) - @RequestBody ArticleCateParam articleCateParam) { - iArticleCategoryService.del(articleCateParam.getId()); + public Object del(@Validated(value = CategoryParam.delete.class) + @RequestBody CategoryParam categoryParam) { + iArticleCategoryService.del(categoryParam.getId()); return AjaxResult.success(); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java index 50e31985..28242bc5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java @@ -5,7 +5,7 @@ import com.hxkj.admin.config.aop.Log; import com.hxkj.admin.service.common.IAlbumService; import com.hxkj.admin.validate.common.AlbumParam; import com.hxkj.admin.validate.common.PageParam; -import com.hxkj.admin.vo.common.album.AlbumVo; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.AjaxResult; import com.hxkj.common.core.PageResult; import com.hxkj.common.utils.ArrayUtil; 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 1c65f119..fd678d4d 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 @@ -2,8 +2,8 @@ package com.hxkj.admin.service.article; 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; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; import com.hxkj.common.core.PageResult; import java.util.Map; 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 07164198..2e265244 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,8 +1,8 @@ package com.hxkj.admin.service.article; -import com.hxkj.admin.validate.article.ArticleCateParam; +import com.hxkj.admin.validate.article.CategoryParam; import com.hxkj.admin.validate.common.PageParam; -import com.hxkj.admin.vo.common.article.ArticleCateVo; +import com.hxkj.admin.vo.article.ArticleCateVo; import com.hxkj.common.core.PageResult; import java.util.List; @@ -43,17 +43,17 @@ public interface IArticleCategoryService { * 分类新增 * * @author fzr - * @param articleCateParam 分类参数 + * @param categoryParam 分类参数 */ - void add(ArticleCateParam articleCateParam); + void add(CategoryParam categoryParam); /** * 分类编辑 * * @author fzr - * @param articleCateParam 分类参数 + * @param categoryParam 分类参数 */ - void edit(ArticleCateParam articleCateParam); + void edit(CategoryParam categoryParam); /** * 分类删除 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 dcdcd5f1..eef58767 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 @@ -7,8 +7,8 @@ import com.github.yulichang.query.MPJQueryWrapper; import com.hxkj.admin.service.article.IArticleArchivesService; 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; +import com.hxkj.admin.vo.article.ArticleDetailVo; +import com.hxkj.admin.vo.article.ArticleListVo; import com.hxkj.common.config.GlobalConfig; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.article.Article; 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 085191a0..b198de35 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,9 +4,9 @@ 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.ArticleCateParam; +import com.hxkj.admin.validate.article.CategoryParam; import com.hxkj.admin.validate.common.PageParam; -import com.hxkj.admin.vo.common.article.ArticleCateVo; +import com.hxkj.admin.vo.article.ArticleCateVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.article.ArticleCategory; import com.hxkj.common.mapper.article.ArticleCategoryMapper; @@ -123,14 +123,14 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { * 分类新增 * * @author fzr - * @param articleCateParam 分类参数 + * @param categoryParam 分类参数 */ @Override - public void add(ArticleCateParam articleCateParam) { + public void add(CategoryParam categoryParam) { ArticleCategory model = new ArticleCategory(); - model.setId(articleCateParam.getId()); - model.setName(articleCateParam.getName()); - model.setSort(articleCateParam.getSort()); + model.setId(categoryParam.getId()); + model.setName(categoryParam.getName()); + model.setSort(categoryParam.getSort()); model.setCreateTime(TimeUtil.timestamp()); model.setUpdateTime(TimeUtil.timestamp()); articleCategoryMapper.insert(model); @@ -140,22 +140,22 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { * 文章编辑 * * @author fzr - * @param articleCateParam 分类参数 + * @param categoryParam 分类参数 */ @Override - public void edit(ArticleCateParam articleCateParam) { + public void edit(CategoryParam categoryParam) { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> !info.getColumn().equals("is_delete") && !info.getColumn().equals("delete_time")) - .eq("id", articleCateParam.getId()) + .eq("id", categoryParam.getId()) .eq("is_delete", 0)); Assert.notNull(model, "分类不存在"); - model.setName(articleCateParam.getName()); - model.setSort(articleCateParam.getSort()); + model.setName(categoryParam.getName()); + model.setSort(categoryParam.getSort()); model.setUpdateTime(TimeUtil.timestamp()); articleCategoryMapper.updateById(model); } diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java index 33e251fa..c1944618 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/IAlbumService.java @@ -3,7 +3,7 @@ package com.hxkj.admin.service.common; import com.alibaba.fastjson.JSONArray; import com.hxkj.admin.validate.common.AlbumParam; import com.hxkj.admin.validate.common.PageParam; -import com.hxkj.admin.vo.common.album.AlbumVo; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import java.util.List; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java index 405edb33..d3d7a932 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/common/impl/AlbumServiceImpl.java @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hxkj.admin.service.common.IAlbumService; import com.hxkj.admin.validate.common.AlbumParam; import com.hxkj.admin.validate.common.PageParam; -import com.hxkj.admin.vo.common.album.AlbumCateVo; -import com.hxkj.admin.vo.common.album.AlbumVo; +import com.hxkj.admin.vo.album.AlbumCateVo; +import com.hxkj.admin.vo.album.AlbumVo; import com.hxkj.common.core.PageResult; import com.hxkj.common.entity.album.Album; import com.hxkj.common.entity.album.AlbumCate; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java similarity index 96% rename from server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java rename to server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java index 48d389c5..5965b8a7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleCateParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class ArticleCateParam implements Serializable { +public class CategoryParam implements Serializable { private static final long serialVersionUID = 1L; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java b/server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java index 1fc31659..28468eca 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/validate/common/AlbumParam.java @@ -12,6 +12,9 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +/** + * 相册参数 + */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java index 75cfce4e..0c025cde 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumCateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.common.album; +package com.hxkj.admin.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java index 9c2ab1a6..649f944b 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/album/AlbumVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.common.album; +package com.hxkj.admin.vo.album; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleCateVo.java similarity index 91% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleCateVo.java index 78156d2d..0f60d853 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleCateVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleCateVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.common.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java similarity index 94% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java index 5e616653..41372d10 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleDetailVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.common.article; +package com.hxkj.admin.vo.article; import lombok.Data; diff --git a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java similarity index 93% rename from server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java rename to server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java index 8b6f00a3..95273897 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/vo/common/article/ArticleListVo.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java @@ -1,4 +1,4 @@ -package com.hxkj.admin.vo.common.article; +package com.hxkj.admin.vo.article; import lombok.Data;