From 6966376f916d20cde507acd099a231020d36c1f0 Mon Sep 17 00:00:00 2001
From: fengtianyangyang <tianyangyang.feng@javashop.cn>
Date: Wed, 13 Apr 2022 11:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=A2=9E=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E5=8F=8A=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E7=B1=BB=E5=9E=8B=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/page/service/ArticleService.java  | 18 +++++++++++++++-
 .../page/serviceimpl/ArticleServiceImpl.java  | 13 ++++++++++++
 .../other/ArticleManagerController.java       | 21 +++++++++++++++++--
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java
index cd677a0b..9fd53538 100644
--- a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java
+++ b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java
@@ -53,7 +53,7 @@ public interface ArticleService extends IService<Article> {
     Article updateArticle(Article article);
 
     /**
-     * 删除文章
+     * 删除文章--id
      *
      * @param id
      */
@@ -87,4 +87,20 @@ public interface ArticleService extends IService<Article> {
      */
     @CacheEvict(key = "#id")
     Boolean updateArticleStatus(String id, boolean status);
+
+    /**
+     * 修改文章--文章类型修改
+     * @param article
+     * @return
+     */
+    @CacheEvict(key = "#article.type")
+    Article updateArticleType(Article article);
+
+    /**
+     * 删除文章--类型
+     * @param type
+     * @param id
+     */
+    @CacheEvict(key = "#type")
+    void delAllByType(String type, String id);
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
index 5c942301..312ad9cc 100644
--- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
@@ -91,4 +91,17 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         article.setOpenStatus(status);
         return this.updateById(article);
     }
+
+    @Override
+    public Article updateArticleType(Article article) {
+        Article oldArticle = this.getById(article.getId());
+        BeanUtil.copyProperties(article, oldArticle);
+        this.updateById(oldArticle);
+        return oldArticle;
+    }
+
+    @Override
+    public void delAllByType(String type,String id) {
+          this.removeById(id);
+    }
 }
\ No newline at end of file
diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
index f9cf79ce..b74da239 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java
@@ -60,7 +60,7 @@ public class ArticleManagerController {
         return ResultUtil.data(article);
     }
 
-    @ApiOperation(value = "修改文章")
+    @ApiOperation(value = "修改文章--文章id")
     @ApiImplicitParam(name = "id", value = "文章ID", required = true, paramType = "path")
     @PutMapping(value = "update/{id}", consumes = "application/json", produces = "application/json")
     public ResultMessage<Article> update(@RequestBody Article article, @PathVariable("id") String id) {
@@ -68,6 +68,23 @@ public class ArticleManagerController {
         return ResultUtil.data(articleService.updateArticle(article));
     }
 
+    @ApiOperation(value = "修改文章--文章类型")
+    @ApiImplicitParam(name = "type", value = "文章类型", required = true, paramType = "path")
+    @PutMapping(value = "updateArticle/{type}", consumes = "application/json", produces = "application/json")
+    public ResultMessage<Article> updateArticle(@RequestBody Article article, @PathVariable("type") String type,String id) {
+        article.setId(id);
+        article.setType(type);
+        return ResultUtil.data(articleService.updateArticleType(article));
+    }
+
+    @ApiOperation(value = "文章删除-文章类型")
+    @ApiImplicitParam(name = "type", value = "文章类型", required = true, dataType = "String", paramType = "path")
+    @DeleteMapping(value = "/delByIds/{type}")
+    public ResultMessage<Object> delAllByType(@PathVariable String type,String id) {
+        articleService.delAllByType(type,id);
+        return ResultUtil.success();
+    }
+
     @ApiOperation(value = "修改文章状态")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "文章ID", required = true, paramType = "path"),
@@ -80,7 +97,7 @@ public class ArticleManagerController {
     }
 
 
-    @ApiOperation(value = "批量删除")
+    @ApiOperation(value = "批量删除--id")
     @ApiImplicitParam(name = "id", value = "文章ID", required = true, dataType = "String", paramType = "path")
     @DeleteMapping(value = "/delByIds/{id}")
     public ResultMessage<Object> delAllByIds(@PathVariable String id) {