From e8bcc62d4bcf6bcf2945b44ff2222fdb4f232718 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Tue, 23 Aug 2022 10:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E7=AB=A0/=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E7=8A=B6=E6=80=81=E5=88=87=E6=8D=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/article/ArticleController.java | 15 ++++++++ .../article/CategoryController.java | 15 ++++++++ .../article/IArticleArchivesService.java | 8 +++++ .../article/IArticleCategoryService.java | 8 +++++ .../impl/ArticleArchivesServiceImpl.java | 22 ++++++++++++ .../impl/ArticleCategoryServiceImpl.java | 34 +++++++++++++++++-- .../admin/validate/article/ArticleParam.java | 3 +- .../admin/validate/article/CategoryParam.java | 3 +- .../mdd/admin/vo/article/ArticleCateVo.java | 1 + 9 files changed, 104 insertions(+), 5 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java index 5b34fb6b..e631559e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/article/ArticleController.java @@ -99,4 +99,19 @@ public class ArticleController { return AjaxResult.success(); } + /** + * 文章状态 + * + * @author fzr + * @param articleParam 文章参数 + * @return Object + */ + @Log(title = "文章状态") + @PostMapping("/change") + public Object change(@Validated(value = ArticleParam.change.class) + @RequestBody ArticleParam articleParam) { + iArticleArchivesService.change(articleParam.getId()); + return AjaxResult.success(); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java index 0ef5e58c..738ae8c4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/article/CategoryController.java @@ -110,4 +110,19 @@ public class CategoryController { return AjaxResult.success(); } + /** + * 分类状态 + * + * @author fzr + * @param categoryParam 分类参数 + * @return Object + */ + @Log(title = "文章分类状态") + @PostMapping("/change") + public Object change(@Validated(value = CategoryParam.change.class) + @RequestBody CategoryParam categoryParam) { + iArticleCategoryService.change(categoryParam.getId()); + return AjaxResult.success(); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java index 4de2cd17..4d0f255c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleArchivesService.java @@ -55,4 +55,12 @@ public interface IArticleArchivesService { */ void del(Integer id); + /** + * 文章状态 + * + * @author fzr + * @param id 文章主键 + */ + void change(Integer id); + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java index 980ae84c..a29fda77 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/IArticleCategoryService.java @@ -63,4 +63,12 @@ public interface IArticleCategoryService { */ void del(Integer id); + /** + * 分类状态 + * + * @author fzr + * @param id 分类ID + */ + void change(Integer id); + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java index 5f5a2c98..b914583b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleArchivesServiceImpl.java @@ -172,6 +172,7 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { public void del(Integer id) { Article article = articleMapper.selectOne( new QueryWrapper
() + .select("id,is_show") .eq("id", id) .eq("is_delete", 0)); @@ -182,4 +183,25 @@ public class ArticleArchivesServiceImpl implements IArticleArchivesService { articleMapper.updateById(article); } + /** + * 文章状态 + * + * @author fzr + * @param id 文章主键 + */ + @Override + public void change(Integer id) { + Article article = articleMapper.selectOne( + new QueryWrapper
() + .select("id,is_show") + .eq("id", id) + .eq("is_delete", 0)); + + Assert.notNull(article, "文章不存在!"); + + article.setIsShow(article.getIsShow()==0?1:0); + article.setUpdateTime(TimeUtil.timestamp()); + articleMapper.updateById(article); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java index 4cfa26ff..ad891cc0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/article/impl/ArticleCategoryServiceImpl.java @@ -8,8 +8,10 @@ import com.mdd.admin.validate.article.CategoryParam; import com.mdd.admin.validate.common.PageParam; import com.mdd.admin.vo.article.ArticleCateVo; import com.mdd.common.core.PageResult; +import com.mdd.common.entity.article.Article; import com.mdd.common.entity.article.ArticleCategory; import com.mdd.common.mapper.article.ArticleCategoryMapper; +import com.mdd.common.mapper.article.ArticleMapper; import com.mdd.common.utils.TimeUtil; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -29,6 +31,9 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { @Resource ArticleCategoryMapper articleCategoryMapper; + @Resource + ArticleMapper articleMapper; + /** * 分类所有 * @@ -84,6 +89,11 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { ArticleCateVo vo = new ArticleCateVo(); BeanUtils.copyProperties(category, vo); + Integer number = articleMapper.selectCount(new QueryWrapper
() + .eq("cid", category.getId()) + .eq("is_delete", 0)); + + vo.setNumber(number); vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime())); vo.setUpdateTime(TimeUtil.timestampToDate(vo.getUpdateTime())); list.add(vo); @@ -170,9 +180,7 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { public void del(Integer id) { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() - .select(ArticleCategory.class, info-> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) + .select("id,is_show") .eq("id", id) .eq("is_delete", 0)); @@ -183,5 +191,25 @@ public class ArticleCategoryServiceImpl implements IArticleCategoryService { articleCategoryMapper.updateById(model); } + /** + * 分类状态 + * + * @author fzr + * @param id 分类ID + */ + @Override + public void change(Integer id) { + ArticleCategory model = articleCategoryMapper.selectOne( + new QueryWrapper() + .select("id,is_show") + .eq("id", id) + .eq("is_delete", 0)); + + Assert.notNull(model, "分类不存在"); + + model.setIsShow(model.getIsShow()==0?1:0); + model.setUpdateTime(TimeUtil.timestamp()); + articleCategoryMapper.updateById(model); + } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java index 95251374..f55aa7c9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/ArticleParam.java @@ -25,8 +25,9 @@ public class ArticleParam implements Serializable { public interface create{} public interface update{} public interface delete{} + public interface change{} - @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class}) + @IDMust(message = "id参数必传且需大于0", groups = {update.class, delete.class, change.class}) private Integer id; @IDMust(message = "id参数必传且需大于0", groups = {create.class, update.class}) diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java b/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java index ccd01c11..ffe89514 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/article/CategoryParam.java @@ -25,8 +25,9 @@ public class CategoryParam implements Serializable { public interface create{} public interface update{} public interface delete{} + public interface change{} - @IDMust(message = "id参数必传且需大于0", groups = {ArticleParam.create.class, ArticleParam.delete.class}) + @IDMust(message = "id参数必传且需大于0", groups = {create.class, delete.class, change.class}) private Integer id; @NotEmpty(message = "分类名称不能为空", groups = {create.class, update.class}) diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java index 134bda3a..ae299312 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/article/ArticleCateVo.java @@ -14,6 +14,7 @@ public class ArticleCateVo implements Serializable { private Integer id; // 主键 private String name; // 分类名称 + private Integer number; // 文章数量 private Integer sort; // 排序编号 private Integer isShow; // 是否显示 private String createTime; // 创建时间