Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

framework/src/main/java/cn/lili/modules/page/service/ArticleService.java

@@ -95,12 +95,4 @@ public interface ArticleService extends IService<Article> {
      */
     @CacheEvict(key = "#article.type")
     Article updateArticleType(Article article);
-
-    /**
-     * 删除文章--类型
-     * @param type
-     * @param id
-     */
-    @CacheEvict(key = "#type")
-    void delAllByType(String type, String id);
 }

framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java

@@ -99,9 +99,4 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         this.updateById(oldArticle);
         return oldArticle;
     }
-
-    @Override
-    public void delAllByType(String type,String id) {
-          this.removeById(id);
-    }
 }

manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java

@@ -77,14 +77,6 @@ public class ArticleManagerController {
         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"),
@@ -97,7 +89,7 @@ public class ArticleManagerController {
     }
 
 
-    @ApiOperation(value = "批量删除--id")
+    @ApiOperation(value = "批量删除")
     @ApiImplicitParam(name = "id", value = "文章ID", required = true, dataType = "String", paramType = "path")
     @DeleteMapping(value = "/delByIds/{id}")
     public ResultMessage<Object> delAllByIds(@PathVariable String id) {