add article list-all api

yangzilong1986 · Feb 14, 2017 · b9c90fd · b9c90fd
1 parent 852881b
commit b9c90fd
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/main/java/diamond/cms/server/config/WebConfig.java b/src/main/java/diamond/cms/server/config/WebConfig.java
@@ -40,9 +40,9 @@ public CommonsMultipartResolver commonsMultipartResolver() {
 
     @Override
     public void addReturnValueHandlers(List<HandlerMethodReturnValueHandler> returnValueHandlers) {
-        returnValueHandlers.add(0, JsonReturnHandler());
-        super.addReturnValueHandlers(returnValueHandlers);
+        returnValueHandlers.add(JsonReturnHandler());
     }
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(crosInterceptor);

diff --git a/src/main/java/diamond/cms/server/controllers/ArticleController.java b/src/main/java/diamond/cms/server/controllers/ArticleController.java
@@ -110,4 +110,12 @@ public List<Article> idTitle() {
     public List<Article> articleMap(){
         return articleService.findArticleSite();
     }
+
+    @RequestMapping(value = "list-all", method = RequestMethod.GET)
+    @IgnoreToken
+    @JSON(type = Article.class, include = "id,title,summary,createTime,updateTime,catalogName,banner")
+    public List<Article> articleListAll(){
+        return articleService.findAll(Article.STATUS_PUBLISH);
+    }
+
 }
diff --git a/src/main/java/diamond/cms/server/services/ArticleService.java b/src/main/java/diamond/cms/server/services/ArticleService.java
@@ -13,6 +13,7 @@
 import java.util.stream.Stream;
 
 import org.jooq.Condition;
+import org.jooq.Field;
 import org.jooq.impl.DSL;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -238,4 +239,20 @@ public void buildTagNames() {
         dao.update(articles);
     }
 
+    public List<Article> findAll(int status) {
+        final Field<?> catalogName = C_CATALOG.NAME.as("catalogName");
+        List<Article> list = dao.execute(e -> {
+            return e.select(Fields.all(C_ARTICLE.fields(),catalogName))
+            .from(C_ARTICLE)
+            .leftJoin(C_CATALOG).on(C_ARTICLE.CATALOG_ID.eq(C_CATALOG.ID))
+            .where(C_ARTICLE.STATUS.eq(status))
+            .orderBy(C_ARTICLE.CREATE_TIME.desc());
+        }).fetch(r -> {
+            Article art = r.into(Article.class);
+            art.setCatalogName(r.get(catalogName, String.class));
+            return art;
+        });
+        return list;
+    }
+
 }