From b30ae3ddcd5059e95bc54a9c858ce70785709f73 Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Wed, 23 Dec 2020 09:50:57 +0800
Subject: [PATCH 1/2] up

---
 .../cases/controller/CaseContentController.java | 17 +++++++++++++++++
 .../bsd/cases/service/CaseContentService.java   |  6 ++++++
 .../service/impl/CaseContentServiceImpl.java    | 10 ++++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java
index 40a1eb3..75076a6 100644
--- a/src/main/java/com/bsd/cases/controller/CaseContentController.java
+++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java
@@ -261,4 +261,21 @@ public class CaseContentController {
         }
         return ajaxResult;
     }
+
+    /**
+     * 后台通过文章id获取文章
+     * @return
+     */
+    @RequestMapping("/get-all-content")
+    public AjaxResult getAllContent() {
+        AjaxResult ajaxResult = new AjaxResult();
+        try {
+            ajaxResult = caseContentService.getAllContentList();
+        } catch (Exception e) {
+            e.printStackTrace();
+            ajaxResult.setRetmsg("操作失败：" + e.getMessage());
+            ajaxResult.setRetcode(AjaxResult.FAILED);
+        }
+        return ajaxResult;
+    }
 }
diff --git a/src/main/java/com/bsd/cases/service/CaseContentService.java b/src/main/java/com/bsd/cases/service/CaseContentService.java
index d1195a8..34ddee2 100644
--- a/src/main/java/com/bsd/cases/service/CaseContentService.java
+++ b/src/main/java/com/bsd/cases/service/CaseContentService.java
@@ -37,4 +37,10 @@ public interface CaseContentService<CaseContent> extends BaseService<CaseContent
      * 转发文章记录
      */
     AjaxResult forwardContent(Long contentId);
+
+    /**
+     * 获取所有的文章列表
+     * @return
+     */
+    AjaxResult getAllContentList();
 }
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 69f5f0f..34db279 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
@@ -412,4 +412,14 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         }
         return ajaxResult;
     }
+
+    @Override
+    public AjaxResult getAllContentList() {
+        AjaxResult ajaxResult = new AjaxResult();
+        CaseContent findCaseContent = new CaseContent();
+        findCaseContent.setState(Constants.STATE_VALID);
+        List<CaseContent> caseContentList = caseContentMapper.select(findCaseContent);
+        ajaxResult.setData(caseContentList);
+        return ajaxResult;
+    }
 }

From e387ff7d93973a15c0999977dfd76c694079ec7b Mon Sep 17 00:00:00 2001
From: ck <851316342@qq.com>
Date: Wed, 23 Dec 2020 10:03:31 +0800
Subject: [PATCH 2/2] up

---
 .../java/com/bsd/cases/mapper/CaseContentMapper.java  |  2 ++
 .../cases/service/impl/CaseContentServiceImpl.java    | 11 +++++++----
 src/main/resources/mapper/CaseContentMapper.xml       |  4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java b/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java
index fa71462..073daa3 100644
--- a/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java
+++ b/src/main/java/com/bsd/cases/mapper/CaseContentMapper.java
@@ -14,4 +14,6 @@ public interface CaseContentMapper extends CommonMapper<CaseContent> {
             , @Param("level1Id") Long level1Id
             , @Param("level2Id") Long level2Id
             , @Param("level3Id") Long level3Id);
+
+    List<CaseContent> getAllContentList();
 }
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 34db279..418f6a8 100644
--- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
+++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java
@@ -8,6 +8,7 @@ import com.bsd.cases.model.*;
 import com.bsd.cases.service.CaseContentService;
 import com.bsd.cases.service.CaseUsersService;
 import com.bsd.cases.util.AjaxResult;
+import com.bsd.cases.util.LogUtils;
 import com.bsd.cases.util.PageAjax;
 import com.bsd.cases.util.PageUtils;
 import com.bsd.cases.vo.CaseContentBakVo;
@@ -16,6 +17,7 @@ import com.bsd.cases.vo.CaseContentDetailVo;
 import com.bsd.cases.vo.CaseContentVo;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -51,6 +53,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     @Resource
     private CaseContentForwardMapper caseContentForwardMapper;
 
+    private Logger logger = LogUtils.getBussinessLogger();
+
     /**
      * 获取文章列表
      *
@@ -190,7 +194,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         Long contentId = jsonObject.getLong("contentId");
         JSONArray contentAttachmentJson = jsonObject.getJSONArray("contentAttachmentJson");
         JSONArray contentMaterialJson = jsonObject.getJSONArray("contentMaterialJson");
-
+        System.out.println("CKTEST"+jsonObject.toJSONString());
+        logger.info("CKTEST"+jsonObject.toJSONString());
         if (null == contentId) {
             //新增
             if (StringUtils.isBlank(contentTitle)) {
@@ -416,9 +421,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     @Override
     public AjaxResult getAllContentList() {
         AjaxResult ajaxResult = new AjaxResult();
-        CaseContent findCaseContent = new CaseContent();
-        findCaseContent.setState(Constants.STATE_VALID);
-        List<CaseContent> caseContentList = caseContentMapper.select(findCaseContent);
+        List<CaseContent> caseContentList = caseContentMapper.getAllContentList();
         ajaxResult.setData(caseContentList);
         return ajaxResult;
     }
diff --git a/src/main/resources/mapper/CaseContentMapper.xml b/src/main/resources/mapper/CaseContentMapper.xml
index 88749af..fa8c4c4 100644
--- a/src/main/resources/mapper/CaseContentMapper.xml
+++ b/src/main/resources/mapper/CaseContentMapper.xml
@@ -26,4 +26,8 @@
            and a.`content_title` LIKE CONCAT('%',#{name},'%')
         </if>
     </select>
+
+    <select id="getAllContentList" resultType="com.bsd.cases.model.CaseContent">
+        select cc.`id`,cc.`content_title` from  case_content cc where cc.state = 1
+    </select>
 </mapper>