From c30c85b86e386293654662585ec22ba24ffb310a Mon Sep 17 00:00:00 2001 From: 86182 Date: Fri, 28 Oct 2022 12:01:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=82=B9=E8=B5=9E=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/entity/Cases.java | 7 +++- .../com/xboe/module/course/entity/Course.java | 7 +++- .../service/impl/FavoritesServiceImpl.java | 32 ++++++++++++++++--- .../com/xboe/module/qa/entity/Question.java | 7 +++- 4 files changed, 46 insertions(+), 7 deletions(-) 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 434834e2..088840f8 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 @@ -229,7 +229,7 @@ public class Cases extends BaseEntity { public Cases() { } - public Cases(String id,String title,String summary,String coverUrl,String authorId,String authorName,LocalDateTime sysCreateTime,Integer breCommend){ + 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){ this.title=title; super.setId(id); this.authorId=authorId; @@ -238,6 +238,11 @@ public class Cases extends BaseEntity { this.summary=summary; this.coverUrl=coverUrl; this.breCommend=breCommend; + this.views=views; + this.comments=comments; + this.praises=praises; + this.shares=shares; + this.favorites=favorites; } public Cases(String id,String title){ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java index 84f184af..4fd4d0f6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/Course.java @@ -324,7 +324,7 @@ public class Course extends BaseEntity { @Transient private Integer auditForward; - public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){ + public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime,Integer views,Integer comments,Integer praises,Integer shares,Integer favorites){ super.setId(id); this.name=name; this.summary=summary; @@ -333,6 +333,11 @@ public class Course extends BaseEntity { super.setSysCreateBy(sysCreateBy); this.type=type; this.publishTime=publishTime; + this.views=views; + this.comments=comments; + this.praises=praises; + this.shares=shares; + this.favorites=favorites; } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java index 47a9aa3d..b5f12d7d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java @@ -177,7 +177,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ if(!courseList.isEmpty()) { QueryBuilder from = QueryBuilder.from(Course.class); from.addFilter(FieldFilters.in("id",courseList)); - from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime)"); + from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime,views,comments,praises,shares,favorites)"); List courses = courseDao.findList(from.builder()); if(!courses.isEmpty()){ for (Course c : courses) { @@ -191,6 +191,11 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setAuthorName(c.getSysCreateBy()); favoriteTotalDto.setContentType(c.getType()); favoriteTotalDto.setPublishTime(c.getPublishTime()); + favoriteTotalDto.setViews(c.getViews()); + favoriteTotalDto.setComments(c.getComments()); + favoriteTotalDto.setPraises(c.getPraises()); + favoriteTotalDto.setShares(c.getShares()); + favoriteTotalDto.setFavorites(c.getFavorites()); } } } @@ -212,6 +217,12 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setAuthorId(a.getSysCreateAid()); favoriteTotalDto.setAuthorName(a.getSysCreateBy()); favoriteTotalDto.setPublishTime(a.getSysCreateTime()); + favoriteTotalDto.setViews(a.getViews()); + favoriteTotalDto.setComments(a.getComments()); + favoriteTotalDto.setPraises(a.getPraises()); + favoriteTotalDto.setShares(a.getShares()); + favoriteTotalDto.setFavorites(a.getFavorites()); + } } } @@ -220,7 +231,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ if(!qaList.isEmpty()) { QueryBuilder from = QueryBuilder.from(Question.class); from.addFilter(FieldFilters.in("id",qaList)); - from.addFields("new Question(id,title,content,images,sysCreateAid,sysCreateBy,sysCreateTime,bestId,bestAnswer,isResolve)"); + from.addFields("new Question(id,title,content,images,sysCreateAid,sysCreateBy,sysCreateTime,bestId,bestAnswer,isResolve,views,answers,praises,shares,favorites)"); List questions = questionDao.findList(from.builder()); if(!questions.isEmpty()) { for (Question q : questions) { @@ -235,6 +246,11 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setBestId(q.getBestId()); favoriteTotalDto.setBestAnswer(q.getBestAnswer()); favoriteTotalDto.setIsResolve(q.getIsResolve()); + favoriteTotalDto.setViews(q.getViews()); + favoriteTotalDto.setComments(q.getAnswers()); + favoriteTotalDto.setPraises(q.getPraises()); + favoriteTotalDto.setShares(q.getShares()); + favoriteTotalDto.setFavorites(q.getFavorites()); } } } @@ -243,7 +259,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ if(!caseList.isEmpty()) { QueryBuilder from = QueryBuilder.from(Cases.class); from.addFilter(FieldFilters.in("id", caseList)); - from.addFields("new Cases(id,title,summary,coverUrl,authorId,authorName,sysCreateTime,breCommend)"); + from.addFields("new Cases(id,title,summary,coverUrl,authorId,authorName,sysCreateTime,breCommend,views,comments,praises,shares,favorites)"); List cases = courseDao.findList(from.builder()); if(!cases.isEmpty()) { for (Cases c : cases) { @@ -256,6 +272,11 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setAuthorName(c.getAuthorName()); favoriteTotalDto.setPublishTime(c.getSysCreateTime()); favoriteTotalDto.setBreCommend(c.getBreCommend()); + favoriteTotalDto.setViews(c.getViews()); + favoriteTotalDto.setComments(c.getComments()); + favoriteTotalDto.setPraises(c.getPraises()); + favoriteTotalDto.setShares(c.getShares()); + favoriteTotalDto.setFavorites(c.getFavorites()); } } } @@ -271,7 +292,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ ids.append(","); } ids.deleteCharAt(ids.length()-1); - String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time from boe_note_info where id in("+ids+")"; + String sql="select id,course_name,content,sys_create_aid,sys_create_by,sys_create_time,praises,favorites,comments from boe_note_info where id in("+ids+")"; List list1 = dao.sqlFindList(sql); for (Object[] o:list1){ for (FavoriteTotalDto favoriteTotalDto : list.getList()) { @@ -280,6 +301,9 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setContent((String) o[2]); favoriteTotalDto.setAuthorId((String) o[3]); favoriteTotalDto.setAuthorName((String) o[4]); + favoriteTotalDto.setPraises((Integer) o[5]); + favoriteTotalDto.setFavorites((Integer) o[6]); + favoriteTotalDto.setComments((Integer) o[6]); Timestamp time = (Timestamp)o[5]; favoriteTotalDto.setPublishTime(time.toLocalDateTime()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Question.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Question.java index 0f92db65..8b026b03 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Question.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/entity/Question.java @@ -128,7 +128,7 @@ public class Question extends BaseEntity { this.answers=answers; } - public Question(String id,String title, String content, String images,String sysCreateAid,String sysCreateBy,LocalDateTime sysCreateTime, String bestId, String bestAnswer,Boolean isResolve) { + public Question(String id,String title, String content, String images,String sysCreateAid,String sysCreateBy,LocalDateTime sysCreateTime, String bestId, String bestAnswer,Boolean isResolve,Integer views,Integer answers,Integer praises,Integer shares,Integer favorites) { this.title = title; this.content = content; this.images = images; @@ -139,6 +139,11 @@ public class Question extends BaseEntity { super.setSysCreateAid(sysCreateAid); super.setSysCreateBy(sysCreateBy); super.setSysCreateTime(sysCreateTime); + this.views=views; + this.answers=answers; + this.praises=praises; + this.shares=shares; + this.favorites=favorites; } public Question(String id,String title){