diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 365f3b1e..84931a24 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -383,4 +383,32 @@ public class CoursePortalApi extends ApiBaseController{ return success(map); } + + /** + * 移动端二期新增 详情页的推荐课程列表 + * */ + @PostMapping("/mobile-list") + public JsonResponse> mobileList(Integer num,CourseQueryDto courseQueryDto){ + if(num==null){ + num=6; + } + List courses = courseService.mobiledelList(num, courseQueryDto); + + //提取教师信息 + List ids=new ArrayList(); + for(Course c :courses) { + ids.add(c.getId()); + } + List teachers = courseService.findTeachersByCourseIds(ids); + //注意对于多个教师的情况，这里只是设置第一个教师 + for(Course c :courses) { + for(CourseTeacher ct : teachers) { + if(ct.getCourseId().equals(c.getId())) { + c.setTeacherId(ct.getTeacherId()); + c.setTeacher(ct.getTeacherName()); + } + } + } + return success(courses); + } } 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 0b288be0..7483a5e0 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 @@ -80,7 +80,7 @@ public class Course extends BaseEntity { this.setStudys(studys); this.setShares(shares); this.setPraises(praises); - this.setFavorites(praises); + this.setFavorites(favorites); this.forUsers=forUsers; this.value=value; this.summary=summary; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java index 40d2d933..53c7bf54 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java @@ -314,4 +314,10 @@ public interface ICourseService { List userHobbyList(String aid,String orderField,Boolean orderAsc); + /** + * 移动端详情页 推荐课程，同内容分类的 + * */ + List mobiledelList(Integer num,CourseQueryDto courseQueryDto); + + } 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 f5d989cb..1df1329c 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 @@ -1115,6 +1115,30 @@ public class CourseServiceImpl implements ICourseService { } + @Override + public List mobiledelList(Integer num, CourseQueryDto courseQueryDto) { + QueryBuilder builder = QueryBuilder.from(Course.class); + builder.setPageSize(num); + builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.eq("enabled",true)); + builder.addFilter(FieldFilters.eq("status",Course.STATUS_AUDIT_FINISH)); + builder.addFilter(FieldFilters.eq("published", true)); + if(courseQueryDto!=null){ + if(StringUtil.isNotBlank(courseQueryDto.getSysType1())){ + builder.addFilter(FieldFilters.eq("sysType1",courseQueryDto.getSysType1())); + } + if(StringUtil.isNotBlank(courseQueryDto.getSysType2())){ + builder.addFilter(FieldFilters.eq("sysType2",courseQueryDto.getSysType2())); + } + if(StringUtil.isNotBlank(courseQueryDto.getSysType3())){ + builder.addFilter(FieldFilters.eq("sysType3",courseQueryDto.getSysType3())); + } + } + builder.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop,sysType1,sysType2,sysType3)"); + List list = courseDao.findList(builder.builder()); + return list; + } + @Override public int countWaitAudit(String aid) { //查询待审核的课程 diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java index da9ca185..eca04f3c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java @@ -126,7 +126,7 @@ public class MessageApi extends ApiBaseController { /** * 移动端 - * 消息页面，按用户分组返回 + * 消息页面，按用户分组返回 暂时不用 * * */ @GetMapping("/mess-group") @@ -141,7 +141,7 @@ public class MessageApi extends ApiBaseController { /** * 移动端 - * 按用户删除消息 + * 按用户删除消息 暂时不用 * */ @GetMapping("/remove") public JsonResponse remove(String aid){ @@ -156,6 +156,19 @@ public class MessageApi extends ApiBaseController { } } + /** + * 用户消息 查最新的一条 + * */ + @GetMapping + public JsonResponse> userMess(){ + String aid = this.getCurrent().getAccountId(); + if(StringUtil.isBlank(aid)){ + return badRequest("参数异常"); + } + List messages = service.userMess(aid); + return success(messages); + } + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java index 82e26a23..ea733185 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java @@ -50,5 +50,9 @@ public interface IMessageService { * */ void remove(String aid); + /** + * 查询最新的一条消息，每个用户 + * */ + List userMess(String aid); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java index 8906546d..04e8ab60 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java @@ -98,4 +98,14 @@ public class MessageServiceImpl implements IMessageService { public void remove(String aid) { dao.deleteByFilter(FieldFilters.eq("acceptId",aid)); } + + @Override + public List userMess(String aid) { + QueryBuilder builder = QueryBuilder.from(Message.class); + builder.addFilter(FieldFilters.eq("acceptId",aid)); + builder.addGroupBy("acceptId"); + builder.addOrder(OrderCondition.desc("msgTime")); + List list = dao.findList(builder.builder()); + return list; + } }