From 2696c3f309ca364045a8c2247e7547027d2f70c6 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Fri, 16 Oct 2020 16:57:05 +0800
Subject: [PATCH] up

---
 .../controller/CaseCategoryController.java    | 27 +++++++++++++++++++
 .../cases/service/CaseCategoryService.java    | 18 +++++++++++++
 .../service/impl/CaseCategoryServiceImpl.java |  2 +-
 .../service/impl/CaseContentServiceImpl.java  | 14 +++++++++-
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java
index 4537ec7..eade2d7 100644
--- a/src/main/java/com/bsd/cases/controller/CaseCategoryController.java
+++ b/src/main/java/com/bsd/cases/controller/CaseCategoryController.java
@@ -55,4 +55,31 @@ public class CaseCategoryController {
         }
         return ajaxResult;
     }
+
+    @RequestMapping("/search")
+    public AjaxResult search(@RequestBody AjaxRequest ajaxRequest,HttpServletRequest request) {
+        AjaxResult ajaxResult = new AjaxResult();
+        JSONObject data = ajaxRequest.getData();
+        if (null == data){
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+            ajaxResult.setRetmsg("data missing");
+        }else {
+            Integer pageNum = data.getInteger("pageNum");
+            Integer pageSize = data.getInteger("pageSize");
+            if (null==pageNum|| null == pageSize){
+                ajaxResult.setRetcode(AjaxResult.FAILED);
+                ajaxResult.setRetmsg("分页参数不可为空");
+            }else {
+                String name = data.getString("name");
+                if (StringUtils.isEmpty(name)){
+                    ajaxResult.setRetcode(AjaxResult.FAILED);
+                    ajaxResult.setRetmsg("搜索参数不可为空");
+                }else {
+                    ajaxResult.setRetcode(AjaxResult.SUCCESS);
+                    ajaxResult.setData(caseCategoryService.search(name,pageNum,pageSize));
+                }
+            }
+        }
+        return ajaxResult;
+    }
 }
diff --git a/src/main/java/com/bsd/cases/service/CaseCategoryService.java b/src/main/java/com/bsd/cases/service/CaseCategoryService.java
index 030bd04..3ce400d 100644
--- a/src/main/java/com/bsd/cases/service/CaseCategoryService.java
+++ b/src/main/java/com/bsd/cases/service/CaseCategoryService.java
@@ -8,9 +8,27 @@ import java.util.List;
 
 public interface CaseCategoryService<CaseCategory> extends BaseService<CaseCategory> {
 
+    /**
+     * 获取首页分级以及默认三级
+     * @return
+     */
     JSONObject getAllCaseCategory();
 
+    /**
+     * 根据父级获取下级分级
+     * @param parentId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     JSONObject getCaseCategoryByParentId(Long parentId,Integer pageNum,Integer pageSize);
 
+    /**
+     * 首页搜索
+     * @param name
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     JSONObject search(String name,Integer pageNum,Integer pageSize);
 }
diff --git a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
index 7b319cb..f9c59ed 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseCategoryServiceImpl.java
@@ -93,7 +93,7 @@ public class CaseCategoryServiceImpl extends BaseServiceImpl<CaseCategoryMapper,
     }
 
     /**
-     * 模糊查询
+     * 首页模糊查询
      * @param name
      * @param pageNum
      * @param pageSize
diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
index ee5ed75..a0190a2 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
@@ -30,7 +30,13 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     @Resource
     private CaseContentAttachmentMapper caseContentAttachmentMapper;
 
-
+    /**
+     * 获取文章列表
+     * @param categoryId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
     @Override
     public JSONObject getContentListByCategoryId(Long categoryId,Integer pageNum,Integer pageSize) {
 
@@ -67,8 +73,14 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         return jsonObject;
     }
 
+    /**
+     * 查看文章详情
+     * @param contentId
+     * @return
+     */
     @Override
     public CaseContentDetailVo getContentDetailByContentId(Long contentId) {
+        //先判断有没有这人有没有看过
         CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId);
         CaseContentDetailVo caseContentDetailVo = new CaseContentDetailVo();
         caseContentDetailVo.setId(contentId);