From 4019b296742eb2a68fb6f9945e9be85932954c12 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 10:45:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/entity/Course.java | 17 +++++++++++++++++ .../module/interaction/dto/FavoriteDto.java | 5 +++++ .../interaction/dto/FavoriteTotalDto.java | 5 +++++ .../service/impl/FavoritesServiceImpl.java | 6 ++++-- 4 files changed, 31 insertions(+), 2 deletions(-) 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 db82897b..5ef75fee 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 @@ -350,5 +350,22 @@ public class Course extends BaseEntity { this.shares=shares; this.favorites=favorites; } + + 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,Float score){ + super.setId(id); + this.name=name; + this.summary=summary; + this.coverImg=coverImg; + super.setSysCreateAid(sysCreateAid); + super.setSysCreateBy(sysCreateBy); + this.type=type; + this.publishTime=publishTime; + this.views=views; + this.comments=comments; + this.praises=praises; + this.shares=shares; + this.favorites=favorites; + this.score=score; + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java index b2a5742f..76a78442 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteDto.java @@ -70,5 +70,10 @@ public class FavoriteDto { * */ private Float progress; + /** + * 课程评分 + * */ + private Float score; + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java index 5b11fff2..a25f5f93 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/interaction/dto/FavoriteTotalDto.java @@ -91,6 +91,11 @@ public class FavoriteTotalDto { * */ private String qid; + /** + * score + * */ + private Float score; + public FavoriteTotalDto() { } 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 aeeece16..c329af1e 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 @@ -189,7 +189,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,views,comments,praises,shares,favorites)"); + from.addFields("new Course(id,name,summary,coverImg,sysCreateAid,sysCreateBy,type,publishTime,views,comments,praises,shares,favorites,score)"); List courses = courseDao.findList(from.builder()); if(!courses.isEmpty()){ for (Course c : courses) { @@ -208,6 +208,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ favoriteTotalDto.setPraises(c.getPraises()); favoriteTotalDto.setShares(c.getShares()); favoriteTotalDto.setFavorites(c.getFavorites()); + favoriteTotalDto.setScore(c.getScore()); } } } @@ -438,7 +439,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ String from=Favorites.class.getSimpleName()+" f,"+Course.class.getSimpleName()+" c"; QueryBuilder query=QueryBuilder.from(from); query.addFields("f.id","f.sysCreateTime","f.objId","c.name","c.summary","c.type","c.coverImg","c.sysCreateAid","c.sysCreateBy"); - query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType"); + query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType","c.score"); query.setPageIndex(pageIndex); query.setPageSize(pageSize); query.addOrder(OrderCondition.desc("f.id")); @@ -478,6 +479,7 @@ public class FavoritesServiceImpl implements IFavoritesService{ dto.setShares(ConvertUtil.toInt(objs[13])); dto.setFavorites(ConvertUtil.toInt(objs[14])); dto.setObjType((Integer) objs[15]); + dto.setScore((Float) objs[16]); result.getList().add(dto); } From fbf46ee5607cee5feed76551e9697b04d9f9c233 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 16:02:07 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/qa/service/impl/AnswerServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java index 3f19454e..c81223c7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/AnswerServiceImpl.java @@ -150,11 +150,11 @@ public class AnswerServiceImpl implements IAnswerService { if(StringUtil.isNoneBlank(qid)){ builder.addFilter(FieldFilters.eq("qid",qid)); } -// if(StringUtil.isNoneBlank(orderType)){ -// builder.addOrder(OrderCondition.desc(orderType)); -// }else{ -// builder.addOrder(OrderCondition.desc("id")); -// } + if(StringUtil.isNoneBlank(orderType)){ + builder.addOrder(OrderCondition.desc(orderType)); + }else{ + builder.addOrder(OrderCondition.asc("sysCreateTime")); + } if(StringUtil.isNoneBlank(keyword)){ builder.addFilter(FieldFilters.like("content",keyword)); } From 87db7bd3b88105b92a1e835e20ba68e8e171afe0 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:07:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/course/service/impl/CourseServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 277e16c0..459a3346 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -370,7 +370,8 @@ public class CourseServiceImpl implements ICourseService { if(rs.isEmpty()) { log.error("未能查询出数据"); } - courses.addAll(rs); +// courses.addAll(rs); + rs.addAll(courses); return courses; } @@ -1040,6 +1041,7 @@ public class CourseServiceImpl implements ICourseService { QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); + builder.addFilter(FieldFilters.gt("score",4.0)); builder.setPageSize(3); List iFieldFilters = new ArrayList<>(); iFieldFilters.add(FieldFilters.in("sysType1",strings)); From 29a727f2b1898609101e8ce418615a47109a82c6 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:10:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 459a3346..e3357b51 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -1041,7 +1041,7 @@ public class CourseServiceImpl implements ICourseService { QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); - builder.addFilter(FieldFilters.gt("score",4.0)); + builder.addFilter(FieldFilters.gt("score",4)); builder.setPageSize(3); List iFieldFilters = new ArrayList<>(); iFieldFilters.add(FieldFilters.in("sysType1",strings)); From 5b2c65b1de35f85f03aa040f1fb8402f7fb24166 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:13:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index e3357b51..0f22e374 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -1041,7 +1041,7 @@ public class CourseServiceImpl implements ICourseService { QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); - builder.addFilter(FieldFilters.gt("score",4)); + builder.addFilter(FieldFilters.gt("score",4.0f)); builder.setPageSize(3); List iFieldFilters = new ArrayList<>(); iFieldFilters.add(FieldFilters.in("sysType1",strings)); From 05019ef7ab3dc924b85f618289dbd4dc51b27751 Mon Sep 17 00:00:00 2001 From: 86182 Date: Wed, 2 Nov 2022 17:16:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index 0f22e374..2fe9682a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -372,7 +372,7 @@ public class CourseServiceImpl implements ICourseService { } // courses.addAll(rs); rs.addAll(courses); - return courses; + return rs; } @Override