优化代码

server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleController.java

@@ -1,7 +1,7 @@
 package com.hxkj.admin.controller.article;
 
 import com.hxkj.admin.config.aop.Log;
-import com.hxkj.admin.service.article.IArticleTextService;
+import com.hxkj.admin.service.article.IArticleArchivesService;
 import com.hxkj.admin.validate.article.ArticleTextParam;
 import com.hxkj.admin.validate.common.PageParam;
 import com.hxkj.admin.vo.common.article.ArticleDetailVo;
@@ -18,12 +18,12 @@ import java.util.Map;
 /**
  * 文章管理
  */
-@RestController
+@RestController(value = "articleArchive")
-@RequestMapping("api/article")
+@RequestMapping("api/article/archive")
-public class TextController {
+public class ArticleController {
 
     @Resource
-    IArticleTextService iArticleTextService;
+    IArticleArchivesService iArticleArchivesService;
 
     /**
      * 文章列表
@@ -36,7 +36,7 @@ public class TextController {
     @GetMapping("/list")
     public Object articleList(@Validated PageParam pageParam,
                               @RequestParam Map<String, String> params) {
-        PageResult<ArticleListVo> vos = iArticleTextService.list(pageParam, params);
+        PageResult<ArticleListVo> vos = iArticleArchivesService.list(pageParam, params);
         return AjaxResult.success(vos);
     }
 
@@ -49,7 +49,7 @@ public class TextController {
      */
     @GetMapping("/detail")
     public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ArticleDetailVo vo = iArticleTextService.detail(id);
+        ArticleDetailVo vo = iArticleArchivesService.detail(id);
         return AjaxResult.success(vo);
     }
 
@@ -65,7 +65,7 @@ public class TextController {
     public Object add(
             @Validated(value = ArticleTextParam.create.class)
             @RequestBody ArticleTextParam articleTextParam) {
-        iArticleTextService.add(articleTextParam);
+        iArticleArchivesService.add(articleTextParam);
         return AjaxResult.success();
     }
 
@@ -80,7 +80,7 @@ public class TextController {
     @PostMapping("/edit")
     public Object edit(@Validated(value = ArticleTextParam.update.class)
                        @RequestBody ArticleTextParam articleTextParam) {
-        iArticleTextService.edit(articleTextParam);
+        iArticleArchivesService.edit(articleTextParam);
         return AjaxResult.success();
     }
 
@@ -95,7 +95,7 @@ public class TextController {
     @PostMapping("/del")
     public Object del(@Validated(value = ArticleTextParam.delete.class)
                       @RequestBody ArticleTextParam articleTextParam) {
-        iArticleTextService.del(articleTextParam.getId());
+        iArticleArchivesService.del(articleTextParam.getId());
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/hxkj/admin/controller/article/CategoryController.java

@@ -1,7 +1,7 @@
 package com.hxkj.admin.controller.article;
 
 import com.hxkj.admin.config.aop.Log;
-import com.hxkj.admin.service.article.IArticleCateService;
+import com.hxkj.admin.service.article.IArticleCategoryService;
 import com.hxkj.admin.validate.article.ArticleCateParam;
 import com.hxkj.admin.validate.common.PageParam;
 import com.hxkj.admin.vo.common.article.ArticleCateVo;
@@ -18,12 +18,12 @@ import java.util.Map;
 /**
  * 文章分类管理
  */
-@RestController
+@RestController(value = "articleCategory")
-@RequestMapping("api/article/cate")
+@RequestMapping("api/article/category")
-public class CateController {
+public class CategoryController {
 
     @Resource
-    IArticleCateService iArticleCateService;
+    IArticleCategoryService iArticleCategoryService;
 
     /**
      * 分类所有
@@ -33,7 +33,7 @@ public class CateController {
      */
     @GetMapping("/all")
     public Object all() {
-        List<ArticleCateVo> list = iArticleCateService.all();
+        List<ArticleCateVo> list = iArticleCategoryService.all();
         return AjaxResult.success(list);
     }
 
@@ -48,7 +48,7 @@ public class CateController {
     @GetMapping("/list")
     public Object list(@Validated PageParam pageParam,
                        @RequestParam Map<String, String> params) {
-        PageResult<ArticleCateVo> list = iArticleCateService.list(pageParam, params);
+        PageResult<ArticleCateVo> list = iArticleCategoryService.list(pageParam, params);
         return AjaxResult.success(list);
     }
 
@@ -61,7 +61,7 @@ public class CateController {
      */
     @GetMapping("/detail")
     public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        ArticleCateVo vo = iArticleCateService.detail(id);
+        ArticleCateVo vo = iArticleCategoryService.detail(id);
         return AjaxResult.success(vo);
     }
 
@@ -76,7 +76,7 @@ public class CateController {
     @PostMapping("/add")
     public Object add(@Validated(value = ArticleCateParam.create.class)
                           @RequestBody ArticleCateParam articleCateParam) {
-        iArticleCateService.add(articleCateParam);
+        iArticleCategoryService.add(articleCateParam);
         return AjaxResult.success();
     }
 
@@ -91,7 +91,7 @@ public class CateController {
     @PostMapping("/edit")
     public Object edit(@Validated(value = ArticleCateParam.update.class)
                            @RequestBody ArticleCateParam articleCateParam) {
-        iArticleCateService.edit(articleCateParam);
+        iArticleCategoryService.edit(articleCateParam);
         return AjaxResult.success();
     }
 
@@ -106,7 +106,7 @@ public class CateController {
     @PostMapping("/cateDel")
     public Object del(@Validated(value = ArticleCateParam.delete.class)
                           @RequestBody ArticleCateParam articleCateParam) {
-        iArticleCateService.del(articleCateParam.getId());
+        iArticleCategoryService.del(articleCateParam.getId());
         return AjaxResult.success();
     }
 

server/like-admin/src/main/java/com/hxkj/admin/controller/common/AlbumController.java

@@ -27,7 +27,7 @@ public class AlbumController {
     IAlbumService iAlbumService;
 
     /**
-     * 相册列表
+     * 相册文件列表
      *
      * @author fzr
      * @return Object
@@ -40,12 +40,12 @@ public class AlbumController {
     }
 
     /**
-     * 相册重命名
+     * 相册文件重命名
      *
      * @author fzr
      * @return Object
      */
-    @Log(title = "相册重命名")
+    @Log(title = "相册文件重命名")
     @PostMapping("/albumRename")
     public Object albumRename(@Validated(value = AlbumParam.rename.class) @RequestBody AlbumParam albumParam) {
         iAlbumService.albumRename(albumParam.getId(), albumParam.getName());
@@ -53,12 +53,12 @@ public class AlbumController {
     }
 
     /**
-     * 相册移动
+     * 相册文件移动
      *
      * @author fzr
      * @return Object
      */
-    @Log(title = "相册移动")
+    @Log(title = "相册文件移动")
     @PostMapping("/albumMove")
     public Object albumMove(@RequestBody Map<String, Object> params) {
         if (params.get("ids") == null) {
@@ -75,12 +75,12 @@ public class AlbumController {
     }
 
     /**
-     * 相册删除
+     * 相册文件删除
      *
      * @author fzr
      * @return Object
      */
-    @Log(title = "相册删除")
+    @Log(title = "相册文件删除")
     @PostMapping("/albumDel")
     public Object albumDel(@RequestBody Map<String, List<Integer>> params) {
         if (params.get("ids") == null) {
@@ -92,7 +92,7 @@ public class AlbumController {
     }
 
     /**
-     * 分类列表
+     * 相册分类列表
      *
      * @author fzr
      * @return Object
@@ -104,7 +104,7 @@ public class AlbumController {
     }
 
     /**
-     * 分类新增
+     * 相册分类新增
      *
      * @author fzr
      * @return Object
@@ -117,7 +117,7 @@ public class AlbumController {
     }
 
     /**
-     * 分类重命名
+     * 相册分类重命名
      *
      * @author fzr
      * @return Object
@@ -130,7 +130,7 @@ public class AlbumController {
     }
 
     /**
-     * 分类删除
+     * 相册分类删除
      *
      * @author fzr
      * @return Object

server/like-admin/src/main/java/com/hxkj/admin/controller/common/UploadController.java

@@ -38,7 +38,13 @@ public class UploadController {
     @Log(title = "上传图片")
     @PostMapping("/image")
     public Object image(HttpServletRequest request) {
-        MultipartFile multipartFile = ((MultipartRequest) request).getFile("file");
+        MultipartFile multipartFile;
+        try {
+            multipartFile = ((MultipartRequest) request).getFile("file");
+        } catch (Exception e) {
+            return AjaxResult.failed("请正确选择上传图片");
+        }
+
         if (multipartFile == null) {
             return AjaxResult.failed("请选择上传图片");
         }
@@ -75,7 +81,13 @@ public class UploadController {
     @Log(title = "上传视频")
     @PostMapping("/video")
     public Object video(HttpServletRequest request) {
-        MultipartFile multipartFile = ((MultipartRequest) request).getFile("file");
+        MultipartFile multipartFile;
+        try {
+            multipartFile = ((MultipartRequest) request).getFile("file");
+        } catch (Exception e) {
+            return AjaxResult.failed("请正确选择上传视频");
+        }
+
         if (multipartFile == null) {
             return AjaxResult.failed("请选择上传视频");
         }

server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleArchivesService.java

@@ -11,7 +11,7 @@ import java.util.Map;
 /**
  * 文章服务接口类
  */
-public interface IArticleTextService {
+public interface IArticleArchivesService {
 
     /**
      * 文章列表

server/like-admin/src/main/java/com/hxkj/admin/service/article/IArticleCategoryService.java

@@ -11,7 +11,7 @@ import java.util.Map;
 /**
  * 文章分类服务类接口
  */
-public interface IArticleCateService {
+public interface IArticleCategoryService {
 
     /**
      * 分类所有

server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleArchivesServiceImpl.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.github.yulichang.query.MPJQueryWrapper;
-import com.hxkj.admin.service.article.IArticleTextService;
+import com.hxkj.admin.service.article.IArticleArchivesService;
 import com.hxkj.admin.validate.article.ArticleTextParam;
 import com.hxkj.admin.validate.common.PageParam;
 import com.hxkj.admin.vo.common.article.ArticleDetailVo;
@@ -30,7 +30,7 @@ import java.util.Map;
  * 文章服务实现类
  */
 @Service
-public class ArticleTextServiceImpl implements IArticleTextService {
+public class ArticleArchivesServiceImpl implements IArticleArchivesService {
 
     @Resource
     ArticleMapper articleMapper;

server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCategoryServiceImpl.java

@@ -3,7 +3,7 @@ package com.hxkj.admin.service.article.impl;
 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.IArticleCateService;
+import com.hxkj.admin.service.article.IArticleCategoryService;
 import com.hxkj.admin.validate.article.ArticleCateParam;
 import com.hxkj.admin.validate.common.PageParam;
 import com.hxkj.admin.vo.common.article.ArticleCateVo;
@@ -24,7 +24,7 @@ import java.util.Map;
  * 文章分类服务实现类
  */
 @Service
-public class ArticleCateServiceImpl implements IArticleCateService {
+public class ArticleCategoryServiceImpl implements IArticleCategoryService {
 
     @Resource
     ArticleCategoryMapper articleCategoryMapper;