From 2a82f1ed5edf810fd20ab3e274532242206b0abe Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 9 Nov 2022 14:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8A=E4=BA=8C=E6=AC=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=AA=E8=BF=94=E5=9B=9E=E9=9C=80=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/article/entity/Article.java | 21 +++++++++++++++- .../article/service/IArticleService.java | 5 ++++ .../service/impl/ArticleServiceImpl.java | 24 ++++++++++++++++++- .../com/xboe/module/boecase/entity/Cases.java | 16 +++++++++++++ .../service/impl/CasesServiceImpl.java | 5 +++- .../com/xboe/school/api/PortalIndexApi.java | 18 ++++++++++++++ 6 files changed, 86 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/entity/Article.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/entity/Article.java index 7bd244bc..f1fcf4a0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/entity/Article.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/entity/Article.java @@ -129,7 +129,26 @@ public class Article extends BaseEntity { this.shares = shares; this.favorites = favorites; } - + public Article(String id,String title,String coverurl,String summary,String sysCreateBy,String sysCreateAid,LocalDateTime sysCreateTime, + LocalDateTime publishTime,Integer views, Integer comments, Integer praises, Integer shares, + Integer favorites,String source,Boolean enabled,Boolean deleted){ + this.setId(id); + this.setTitle(title); + this.summary=summary; + this.coverurl=coverurl; + this.publishTime=publishTime; + this.views = views; + this.comments = comments; + this.praises = praises; + this.shares = shares; + this.favorites = favorites; + super.setSysCreateBy(sysCreateBy); + super.setSysCreateAid(sysCreateAid); + super.setSysCreateTime(sysCreateTime); + this.source = source; + this.enabled = enabled; + super.setDeleted(deleted); + } public Article(String id,String title,String summary,String coverurl,String author,String authorInfo,LocalDateTime publishTime) { this.setId(id); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/IArticleService.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/IArticleService.java index 626eaee1..174dee83 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/IArticleService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/IArticleService.java @@ -23,6 +23,11 @@ public interface IArticleService { * 首页二期第一张必须是带图的 * */ List
articelList(Integer type); + + /** + * 移动端首页 必须都是带图的 + * */ + List
mobileList(Integer type); /** * 自定义条件查询 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index 788c6cad..d7d0f307 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -90,6 +90,25 @@ public class ArticleServiceImpl implements IArticleService{ } + @Override + public List
mobileList(Integer type) { + QueryBuilder builder = QueryBuilder.from(Article.class); + if(type==2){ + builder.addOrder(OrderCondition.desc("views")); + }else{ + builder.addOrder(OrderCondition.desc("sysCreateTime")); + } + builder.addFilter(FieldFilters.eq("status", Article.STATUS_PUBLISH)); + builder.addFilter(FieldFilters.eq("enabled",true)); + builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.isNotNull("coverurl")); + builder.addFilter(FieldFilters.ge("coverurl", "")); + + builder.setPageSize(4); + List
list = dao.findList(builder.builder()); + return list; + } + //当前先实现，后续优化 @Override public PageList
query(Integer pageIndex, Integer pageSize,List filters, OrderCondition order) { @@ -331,7 +350,10 @@ public class ArticleServiceImpl implements IArticleService{ @Override public List
ids(List ids) { - List
list = dao.findList(FieldFilters.in("id", ids)); + QueryBuilder builder = QueryBuilder.from(Article.class); + builder.addFilter(FieldFilters.in("id", ids)); + builder.addFields("new Article(id,title,coverurl,summary,sysCreateBy,sysCreateAid,sysCreateTime,publishTime,views,comments,praises,shares,favorites,source,enabled,deleted)"); + List
list = dao.findList(builder.builder()); return list; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java index 03d98525..e2ac5ccd 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java @@ -262,4 +262,20 @@ public class Cases extends BaseEntity { super.setId(id); this.title=title; } + public Cases(String id,String title,String summary,String coverUrl,String authorId,String authorName,LocalDateTime sysCreateTime,Integer breCommend,Integer views,Integer comments,Integer praises,Integer shares,Integer favorites,Boolean deleted){ + this.title=title; + super.setId(id); + this.authorId=authorId; + this.authorName=authorName; + super.setSysCreateTime(sysCreateTime); + this.summary=summary; + this.coverUrl=coverUrl; + this.breCommend=breCommend; + this.views=views; + this.comments=comments; + this.praises=praises; + this.shares=shares; + this.favorites=favorites; + super.setDeleted(deleted); + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 4e8cf2d1..e09b30e0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -452,7 +452,10 @@ public class CasesServiceImpl implements ICasesService { @Override public List ids(List ids) { - List cases = casesDao.findList(FieldFilters.in("id", ids)); + QueryBuilder builder = QueryBuilder.from(Cases.class); + builder.addFilter(FieldFilters.in("id", ids)); + builder.addFields("id","title","summary","coverUrl","comments","praises","favorites","sysCreateAid","sysCreateBy","sysCreateTime","authorId","authorName","views","deleted"); + List cases = casesDao.findList(builder.builder()); return cases; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java index e074ab25..c6b0a1aa 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java @@ -243,6 +243,24 @@ public class PortalIndexApi extends ApiBaseController{ } + /** + * 移动端首页文章列表 + * */ + @GetMapping("/mobile-article") + public JsonResponse> mobileArticle(Integer type){ + if(type==null || type==0){ + return badRequest("参数异常"); + } + try { + List
articles = articleService.mobileList(type); + return success(articles); + } catch (Exception e) { + return error("查询失败",e.getMessage()); + } + } + + + }