Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java

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;
+    }
 }

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();
 }

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();
 }

src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java

@@ -53,6 +53,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
     @Resource
     private CaseContentForwardMapper caseContentForwardMapper;
     private Logger logger = LogUtils.getPlatformLogger();
+
     /**
      * 获取文章列表
      *
@@ -192,9 +193,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
         Long contentId = jsonObject.getLong("contentId");
         JSONArray contentAttachmentJson = jsonObject.getJSONArray("contentAttachmentJson");
         JSONArray contentMaterialJson = jsonObject.getJSONArray("contentMaterialJson");
-        logger.info("CKTEST"+ jsonObject.toJSONString());
-        System.out.println("CKTEST"+ jsonObject.toJSONString());
-        if (null == contentId) {
+        System.out.println("CKTEST"+jsonObject.toJSONString());
+        logger.info("CKTEST"+jsonObject.toJSONString());if (null == contentId) {
             //新增
             if (StringUtils.isBlank(contentTitle)) {
                 ajaxResult.setRetcode(AjaxResult.FAILED);

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>