From c7e51159a47c3faa671ba24b28e8ac53a0158845 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 2 Nov 2022 10:27:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/ICourseService.java | 4 ++-- .../xboe/module/course/service/impl/CourseServiceImpl.java | 7 +++++-- .../src/main/java/com/xboe/school/api/PortalIndexApi.java | 4 ++-- 3 files changed, 9 insertions(+), 6 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 9f873908..e322eed7 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 @@ -107,13 +107,13 @@ public interface ICourseService { PageList findSimplePage(int pageIndex, int pageSize, CourseQueryDto dto); /** - * 只是查询少量字段 + * 只是查询少量字段,只是首页使用 * @param pageIndex * @param pageSize * @param dto * @return */ - List findSimpleList(int pageSize,CourseQueryDto dto); + List findSimpleList(int pageIndex,String currentAid,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 2b67a90e..277e16c0 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 @@ -322,7 +322,7 @@ public class CourseServiceImpl implements ICourseService { } @Override - public List findSimpleList(int pageSize, CourseQueryDto dto) { + public List findSimpleList(int pageIndex,String currentAid, CourseQueryDto dto) { List filters = createFilters(dto); //自动添加过滤已删除 filters.add(FieldFilters.eq("deleted",false)); @@ -357,7 +357,7 @@ public class CourseServiceImpl implements ICourseService { // } int num=6; - List courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc()); + List courses = this.userHobbyList(currentAid, dto.getOrderField(), dto.getOrderAsc()); if(courses!=null && !courses.isEmpty()){ num=6-courses.size(); //重复的不包括 @@ -367,6 +367,9 @@ public class CourseServiceImpl implements ICourseService { 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()); + if(rs.isEmpty()) { + log.error("未能查询出数据"); + } courses.addAll(rs); return courses; } 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 f983c85d..77e80ffe 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 @@ -130,8 +130,8 @@ public class PortalIndexApi extends ApiBaseController{ String aid = this.getCurrent().getAccountId(); dto.setPublish(true); dto.setYearFilter(true); - dto.setAid(aid); - List coursePageList = courseService.findSimpleList( pager.getPageSize(),dto); + + List coursePageList = courseService.findSimpleList(pager.getPageIndex(), aid,dto); // List courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); From d33293f40ce82668f6f268a1c38f2251ae1ad57c Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 2 Nov 2022 10:28:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/resources/application-dev.properties b/servers/boe-server-all/src/main/resources/application-dev.properties index fd9c153d..54c20ab0 100644 --- a/servers/boe-server-all/src/main/resources/application-dev.properties +++ b/servers/boe-server-all/src/main/resources/application-dev.properties @@ -9,7 +9,7 @@ spring.jpa.show-sql = true spring.jpa.hibernate.ddl-auto=update spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boeu_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.url=jdbc:mysql://192.168.0.11:3306/boeu_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull spring.datasource.username=root spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)