From 10af661432e34f3565fa4516ca389d866cd2131e Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 18:03:54 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 a55dff47..6c7ab2bc 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 @@ -142,6 +142,12 @@ public class PortalIndexApi extends ApiBaseController{ i++; } } + //因为固定是6个 + coursePageList.getList().remove(6); + coursePageList.getList().remove(7); + coursePageList.getList().remove(8); + + //提取教师信息 List ids=new ArrayList(); From 4e7cf415d23d51fa401c42330e979432ef84259f Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 18:10:01 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 6c7ab2bc..a0d05434 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 @@ -140,12 +140,10 @@ public class PortalIndexApi extends ApiBaseController{ for (Course c:courses) { coursePageList.getList().add(i,c); i++; + coursePageList.getList().remove(coursePageList.getList().size()-i); } } - //因为固定是6个 - coursePageList.getList().remove(6); - coursePageList.getList().remove(7); - coursePageList.getList().remove(8); + From a3e42a2e26dc8de47548255e01e61f00812ea9b2 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 18:26:35 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/api/PortalIndexApi.java | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) 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 a0d05434..887a89f2 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 @@ -2,6 +2,7 @@ package com.xboe.school.api; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -135,28 +136,44 @@ public class PortalIndexApi extends ApiBaseController{ List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); //计算下标, - int i=0; - if(!courses.isEmpty()){ - for (Course c:courses) { - coursePageList.getList().add(i,c); - i++; - coursePageList.getList().remove(coursePageList.getList().size()-i); +// int i=0; +// if(!courses.isEmpty()){ +// for (Course c:courses) { +// coursePageList.getList().add(i,c); +// i++; +// coursePageList.getList().remove(coursePageList.getList().size()-i); +// } +// } + PageList list = new PageList<>(); + list.setList(new ArrayList<>(6)); + if(!courses.isEmpty()) { + for (Course c:courses){ + list.getList().add(c); } } + for (int i=0;i collect = list.getList().stream().distinct().collect(Collectors.toList()); + if(collect.size() ids=new ArrayList(); - for(Course c :coursePageList.getList()) { + for(Course c :list.getList()) { ids.add(c.getId()); } List teachers = courseService.findTeachersByCourseIds(ids); //注意对于多个教师的情况，这里只是设置第一个教师 - for(Course c :coursePageList.getList()) { + for(Course c :list.getList()) { for(CourseTeacher ct : teachers) { if(ct.getCourseId().equals(c.getId())) { c.setSysCreateAid(ct.getTeacherId()); From aa2cedd666b704ebe55d6a59805d1aee5c07ec1b Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 18:31:58 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/api/PortalIndexApi.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 887a89f2..d9c67b04 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 @@ -156,12 +156,12 @@ public class PortalIndexApi extends ApiBaseController{ } //如果有重复 - List collect = list.getList().stream().distinct().collect(Collectors.toList()); - if(collect.size() collect = list.getList().stream().distinct().collect(Collectors.toList()); +// if(collect.size() Date: Tue, 1 Nov 2022 18:37:17 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/api/PortalIndexApi.java | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) 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 d9c67b04..80449c39 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 @@ -136,25 +136,31 @@ public class PortalIndexApi extends ApiBaseController{ List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); //计算下标, -// int i=0; -// if(!courses.isEmpty()){ -// for (Course c:courses) { -// coursePageList.getList().add(i,c); -// i++; + int i=0; + if(!courses.isEmpty()){ + for (Course c:courses) { + coursePageList.getList().set(i,c); + i++; // coursePageList.getList().remove(coursePageList.getList().size()-i); -// } -// } - PageList list = new PageList<>(); - list.setList(new ArrayList<>(6)); - if(!courses.isEmpty()) { - for (Course c:courses){ - list.getList().add(c); } } - for (int i=0;i list = new PageList<>(); +// list.setList(new ArrayList<>(6)); +// if(!courses.isEmpty()) { +// for (Course c:courses){ +// list.getList().add(c); +// } +// } +// for (int i=0;i collect = list.getList().stream().distinct().collect(Collectors.toList()); // if(collect.size() ids=new ArrayList(); - for(Course c :list.getList()) { + for(Course c :coursePageList.getList()) { ids.add(c.getId()); } List teachers = courseService.findTeachersByCourseIds(ids); //注意对于多个教师的情况，这里只是设置第一个教师 - for(Course c :list.getList()) { + for(Course c :coursePageList.getList()) { for(CourseTeacher ct : teachers) { if(ct.getCourseId().equals(c.getId())) { c.setSysCreateAid(ct.getTeacherId()); From 563c0743bb2cbb49271a14c7778bed59a5ca284f Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 18:54:06 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/api/PortalIndexApi.java | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) 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 80449c39..ac194256 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 @@ -135,51 +135,49 @@ public class PortalIndexApi extends ApiBaseController{ String aid = this.getCurrent().getAccountId(); List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); - //计算下标, + PageList pageList = new PageList<>(); + pageList.setList(new ArrayList<>(6)); + int i=0; if(!courses.isEmpty()){ for (Course c:courses) { - coursePageList.getList().set(i,c); + pageList.getList().add(i,c); i++; // coursePageList.getList().remove(coursePageList.getList().size()-i); } } + //去重并添加 for (Course c:coursePageList.getList()) { - coursePageList.getList().set(i,c); + for (Course c1:courses) { + if(!c.getId().equals(c1.getId())){ + pageList.getList().add(c); + } + } } + + //计算下标, + + + + + + -// PageList list = new PageList<>(); -// list.setList(new ArrayList<>(6)); -// if(!courses.isEmpty()) { -// for (Course c:courses){ -// list.getList().add(c); -// } -// } -// for (int i=0;i collect = list.getList().stream().distinct().collect(Collectors.toList()); -// if(collect.size() ids=new ArrayList(); - for(Course c :coursePageList.getList()) { + for(Course c :pageList.getList()) { ids.add(c.getId()); } List teachers = courseService.findTeachersByCourseIds(ids); //注意对于多个教师的情况，这里只是设置第一个教师 - for(Course c :coursePageList.getList()) { + for(Course c :pageList.getList()) { for(CourseTeacher ct : teachers) { if(ct.getCourseId().equals(c.getId())) { c.setSysCreateAid(ct.getTeacherId()); @@ -188,7 +186,7 @@ public class PortalIndexApi extends ApiBaseController{ } } - return success(coursePageList); + return success(pageList); } From e91d11ca2891af6f6310fbc0a3a67fd98ce61375 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:01:27 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/impl/CourseServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 2592059c..3b720ecd 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 @@ -980,6 +980,9 @@ public class CourseServiceImpl implements ICourseService { for (Object o:list) { strings.add((String) o); } + if(list.isEmpty()){ + return courses; + } QueryBuilder builder = QueryBuilder.from(Course.class); builder.addFilter(FieldFilters.eq("deleted",false)); builder.addFilter(FieldFilters.eq("enabled",true)); From d8b7f33110c075bd2146ff03b4d4e0b85bff35d2 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:06:48 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 ac194256..e5828513 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 @@ -136,7 +136,7 @@ public class PortalIndexApi extends ApiBaseController{ List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); PageList pageList = new PageList<>(); - pageList.setList(new ArrayList<>(6)); + pageList.setList(new ArrayList<>()); int i=0; if(!courses.isEmpty()){ @@ -152,6 +152,10 @@ public class PortalIndexApi extends ApiBaseController{ for (Course c1:courses) { if(!c.getId().equals(c1.getId())){ pageList.getList().add(c); + if(pageList.getList().size()>=6){ + break; + } + } } } From 113b1db8e439d1a18d3b2b4c1a4b90047310956d Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:13:03 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 e5828513..d1582e2b 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 @@ -150,12 +150,8 @@ public class PortalIndexApi extends ApiBaseController{ //去重并添加 for (Course c:coursePageList.getList()) { for (Course c1:courses) { - if(!c.getId().equals(c1.getId())){ + if(pageList.getList().size()<=6){ pageList.getList().add(c); - if(pageList.getList().size()>=6){ - break; - } - } } } From ad8cef63ebe97cf86a0190df27b18c6883667a84 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:18:17 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 d1582e2b..2310b4d6 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 @@ -148,11 +148,10 @@ public class PortalIndexApi extends ApiBaseController{ } //去重并添加 + for (Course c:coursePageList.getList()) { - for (Course c1:courses) { - if(pageList.getList().size()<=6){ - pageList.getList().add(c); - } + if(pageList.getList().size()<=6){ + pageList.getList().add(c); } } From c51b0f64dd7f4bfa03a6b8979fc2af567aed9aad Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:19:27 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 3 +++ 1 file changed, 3 insertions(+) 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 2310b4d6..01fbd3f5 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 @@ -153,6 +153,9 @@ public class PortalIndexApi extends ApiBaseController{ if(pageList.getList().size()<=6){ pageList.getList().add(c); } + if(pageList.getList().size()>6){ + break; + } } //计算下标, From 3e99afd0ae1c65ed31b0fde2cf879b03d55bf9f9 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:22:46 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 2 ++ 1 file changed, 2 insertions(+) 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 01fbd3f5..74516fe0 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 @@ -137,6 +137,8 @@ public class PortalIndexApi extends ApiBaseController{ PageList pageList = new PageList<>(); pageList.setList(new ArrayList<>()); + pageList.setPageSize(6); + pageList.setCount(coursePageList.getCount()); int i=0; if(!courses.isEmpty()){ From 46b2c5a77f3357d5cbf224352c3d5b76a820170a Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:28:34 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 74516fe0..14843dbe 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 @@ -136,7 +136,7 @@ public class PortalIndexApi extends ApiBaseController{ List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); PageList pageList = new PageList<>(); - pageList.setList(new ArrayList<>()); + pageList.setList(new ArrayList()); pageList.setPageSize(6); pageList.setCount(coursePageList.getCount()); From 6abad3f074b3a0ec68b54eeb3dcac8fd1b061dfc Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:32:12 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 14843dbe..edaf8b91 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 @@ -152,10 +152,10 @@ public class PortalIndexApi extends ApiBaseController{ //去重并添加 for (Course c:coursePageList.getList()) { - if(pageList.getList().size()<=6){ + if(pageList.getList().size()<6){ pageList.getList().add(c); } - if(pageList.getList().size()>6){ + if(pageList.getList().size()>=6){ break; } } From a6f715179ba7658a9f5ed571912154df4f9ab39b Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:47:12 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/api/PortalIndexApi.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 edaf8b91..9b0176c3 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 @@ -148,8 +148,18 @@ public class PortalIndexApi extends ApiBaseController{ // coursePageList.getList().remove(coursePageList.getList().size()-i); } } + if(!courses.isEmpty()){ + for (Course c:courses) { + for (Course c1:pageList.getList()) { + if(c.getId().equals(c1.getId())){ + pageList.getList().remove(c1); + } + } + } + } - //去重并添加 + + //并添加 for (Course c:coursePageList.getList()) { if(pageList.getList().size()<6){ @@ -160,15 +170,7 @@ public class PortalIndexApi extends ApiBaseController{ } } - //计算下标, - - - - - - - - + //去重, From 4e3a94bc48639ac747dacca118941bef97c72e49 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 19:50:53 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9b0176c3..48f6bf4b 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 @@ -150,9 +150,9 @@ public class PortalIndexApi extends ApiBaseController{ } if(!courses.isEmpty()){ for (Course c:courses) { - for (Course c1:pageList.getList()) { + for (Course c1:coursePageList.getList()) { if(c.getId().equals(c1.getId())){ - pageList.getList().remove(c1); + coursePageList.getList().remove(c1); } } } From 02ca78c657356e947334574f4b70284d35591f97 Mon Sep 17 00:00:00 2001 From: 86182 Date: Tue, 1 Nov 2022 20:53:14 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/service/ICourseService.java | 11 +- .../service/impl/CourseServiceImpl.java | 57 +++++++++- .../com/xboe/school/api/PortalIndexApi.java | 104 ++++++++++-------- 3 files changed, 125 insertions(+), 47 deletions(-) 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 09d29ce2..9f873908 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 @@ -105,7 +105,16 @@ public interface ICourseService { * @return */ PageList findSimplePage(int pageIndex, int pageSize, CourseQueryDto dto); - + + /** + * 只是查询少量字段 + * @param pageIndex + * @param pageSize + * @param dto + * @return + */ + List findSimpleList(int pageSize,CourseQueryDto dto); + /** * 添加课程 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 3b720ecd..f05ab9e8 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 @@ -6,6 +6,7 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Resource; @@ -319,7 +320,61 @@ public class CourseServiceImpl implements ICourseService { return rs; } - + + @Override + public List findSimpleList(int pageSize, CourseQueryDto dto) { + List filters = createFilters(dto); + //自动添加过滤已删除 + filters.add(FieldFilters.eq("deleted",false)); + filters.add(FieldFilters.eq("enabled",true)); + + QueryBuilder query=QueryBuilder.from(Course.class).addFilters(filters); + + if(dto.getTopOrder()!=null) { + if(dto.getTopOrder()){ + query.addOrder(OrderCondition.desc("isTop")); + query.addOrder(OrderCondition.desc("topTime")); + } + } + OrderCondition oc=null; + if(StringUtils.isNotBlank(dto.getOrderField())) { + if(dto.getOrderAsc()==null || dto.getOrderAsc()) { + oc=OrderCondition.asc(dto.getOrderField()); + }else { + oc=OrderCondition.desc(dto.getOrderField()); + } + }else { + //oc=OrderCondition.desc("id"); + //默认按发布时间排序 + oc=OrderCondition.desc("publishTime"); + } + query.addOrder(oc); + +// if(dto.getTopOrder()!=null && dto.getTopOrder()){ +// query.addOrder(OrderCondition.desc("topTime")); +// } + + List courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc()); + if(courses!=null && courses.isEmpty()){ + System.out.println(courses.size()); + query.setPageSize(pageSize); + } + else{ + System.out.println(courses.size()); + query.setPageSize(pageSize-courses.size()); + //重复的不包括 + List courseIds = courses.stream().map(Course::getId).collect(Collectors.toList()); + query.addFilter(FieldFilters.notIn("id",courseIds)); + } + + query.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop)"); + + List rs=courseDao.findList(query.builder()); + System.out.println(rs.size()+"asdasd"); + courses.addAll(rs); + return courses; + } + @Override public void save(Course course) { course.setComments(0); 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 48f6bf4b..f983c85d 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 @@ -126,64 +126,78 @@ public class PortalIndexApi extends ApiBaseController{ *推荐课程 * */ @PostMapping("/courselist") - public JsonResponse> courseList(Pagination pager, CourseQueryDto dto){ - + public JsonResponse> courseList(Pagination pager, CourseQueryDto dto){ + String aid = this.getCurrent().getAccountId(); dto.setPublish(true); dto.setYearFilter(true); - PageList coursePageList = courseService.findSimplePage(pager.getPageIndex(), pager.getPageSize(),dto); - - String aid = this.getCurrent().getAccountId(); - List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); - - PageList pageList = new PageList<>(); - pageList.setList(new ArrayList()); - pageList.setPageSize(6); - pageList.setCount(coursePageList.getCount()); - - int i=0; - if(!courses.isEmpty()){ - for (Course c:courses) { - pageList.getList().add(i,c); - i++; -// coursePageList.getList().remove(coursePageList.getList().size()-i); - } - } - if(!courses.isEmpty()){ - for (Course c:courses) { - for (Course c1:coursePageList.getList()) { - if(c.getId().equals(c1.getId())){ - coursePageList.getList().remove(c1); - } - } - } - } + dto.setAid(aid); + List coursePageList = courseService.findSimpleList( pager.getPageSize(),dto); - //并添加 - - for (Course c:coursePageList.getList()) { - if(pageList.getList().size()<6){ - pageList.getList().add(c); - } - if(pageList.getList().size()>=6){ - break; - } - } - - //去重, - +// List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); +// +// PageList pageList = new PageList<>(); +// pageList.setList(new ArrayList()); +// pageList.setPageSize(6); +// pageList.setCount(coursePageList.getCount()); +// +// int i=0; +// if(!courses.isEmpty()){ +// for (Course c:courses) { +// pageList.getList().add(i,c); +// i++; +//// coursePageList.getList().remove(coursePageList.getList().size()-i); +// } +// } +//// if(!courses.isEmpty()){ +//// for (Course c:courses) { +//// for (Course c1:coursePageList.getList()) { +//// if(c.getId().equals(c1.getId())){ +//// coursePageList.getList().remove(c1); +//// } +//// } +//// } +//// } +// +// +// //并添加 +// +// for (Course c:coursePageList.getList()) { +// if(pageList.getList().size()<6){ +// pageList.getList().add(c); +// } +// if(pageList.getList().size()>=6){ +// break; +// } +// } +// +// //去重, +// List collect = pageList.getList().stream().distinct().collect(Collectors.toList()); +// if(collect.size()=6){ +// break; +// } +// } +// break; +// } +// } //提取教师信息 List ids=new ArrayList(); - for(Course c :pageList.getList()) { + for(Course c :coursePageList) { ids.add(c.getId()); } List teachers = courseService.findTeachersByCourseIds(ids); //注意对于多个教师的情况，这里只是设置第一个教师 - for(Course c :pageList.getList()) { + for(Course c :coursePageList) { for(CourseTeacher ct : teachers) { if(ct.getCourseId().equals(c.getId())) { c.setSysCreateAid(ct.getTeacherId()); @@ -192,7 +206,7 @@ public class PortalIndexApi extends ApiBaseController{ } } - return success(pageList); + return success(coursePageList); } From c8f632ab7900cd050ad4a2f3b8ae64f0bc2cf99d Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 1 Nov 2022 21:00:17 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseServiceImpl.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) 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 f05ab9e8..2b67a90e 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 @@ -327,6 +327,8 @@ public class CourseServiceImpl implements ICourseService { //自动添加过滤已删除 filters.add(FieldFilters.eq("deleted",false)); filters.add(FieldFilters.eq("enabled",true)); + //返回的结果 + QueryBuilder query=QueryBuilder.from(Course.class).addFilters(filters); @@ -353,24 +355,18 @@ public class CourseServiceImpl implements ICourseService { // if(dto.getTopOrder()!=null && dto.getTopOrder()){ // query.addOrder(OrderCondition.desc("topTime")); // } - + + int num=6; List courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc()); - if(courses!=null && courses.isEmpty()){ - System.out.println(courses.size()); - query.setPageSize(pageSize); - } - else{ - System.out.println(courses.size()); - query.setPageSize(pageSize-courses.size()); + if(courses!=null && !courses.isEmpty()){ + num=6-courses.size(); //重复的不包括 List courseIds = courses.stream().map(Course::getId).collect(Collectors.toList()); query.addFilter(FieldFilters.notIn("id",courseIds)); } - + query.setPageSize(num); query.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop)"); - List rs=courseDao.findList(query.builder()); - System.out.println(rs.size()+"asdasd"); courses.addAll(rs); return courses; }