hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-12 04:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'preview' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers into release

Browse Source
This commit is contained in:
dongruihua
2022-11-02 10:29:32 +08:00
parent 9668a70fe9 d33293f40c
commit 05db52bad1
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
View File

@@ -107,13 +107,13 @@ public interface ICourseService {
PageList<Course> findSimplePage(int pageIndex, int pageSize, CourseQueryDto dto); PageList<Course> findSimplePage(int pageIndex, int pageSize, CourseQueryDto dto);
/** /**
* 只是查询少量字段 * 只是查询少量字段,只是首页使用
* @param pageIndex * @param pageIndex
* @param pageSize * @param pageSize
* @param dto * @param dto
* @return * @return
*/ */
List<Course> findSimpleList(int pageSize,CourseQueryDto dto); List<Course> findSimpleList(int pageIndex,String currentAid,CourseQueryDto dto);
/** /**

7
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -322,7 +322,7 @@ public class CourseServiceImpl implements ICourseService {
} }
@Override @Override
public List<Course> findSimpleList(int pageSize, CourseQueryDto dto) { public List<Course> findSimpleList(int pageIndex,String currentAid, CourseQueryDto dto) {
List<IFieldFilter> filters = createFilters(dto); List<IFieldFilter> filters = createFilters(dto);
//自动添加过滤已删除 //自动添加过滤已删除
filters.add(FieldFilters.eq("deleted",false)); filters.add(FieldFilters.eq("deleted",false));
@@ -357,7 +357,7 @@ public class CourseServiceImpl implements ICourseService {
// } // }
int num=6; int num=6;
List<Course> courses = this.userHobbyList(dto.getAid(), dto.getOrderField(), dto.getOrderAsc()); List<Course> courses = this.userHobbyList(currentAid, dto.getOrderField(), dto.getOrderAsc());
if(courses!=null && !courses.isEmpty()){ if(courses!=null && !courses.isEmpty()){
num=6-courses.size(); num=6-courses.size();
//重复的不包括 //重复的不包括
@@ -367,6 +367,9 @@ public class CourseServiceImpl implements ICourseService {
query.setPageSize(num); query.setPageSize(num);
query.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop)"); query.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop)");
List<Course> rs=courseDao.findList(query.builder()); List<Course> rs=courseDao.findList(query.builder());
if(rs.isEmpty()) {
log.error("未能查询出数据");
}
courses.addAll(rs); courses.addAll(rs);
return courses; return courses;
} }

4
servers/boe-server-all/src/main/java/com/xboe/school/api/PortalIndexApi.java
View File

@@ -130,8 +130,8 @@ public class PortalIndexApi extends ApiBaseController{
String aid = this.getCurrent().getAccountId(); String aid = this.getCurrent().getAccountId();
dto.setPublish(true); dto.setPublish(true);
dto.setYearFilter(true); dto.setYearFilter(true);
dto.setAid(aid);
List<Course> coursePageList = courseService.findSimpleList( pager.getPageSize(),dto); List<Course> coursePageList = courseService.findSimpleList(pager.getPageIndex(), aid,dto);
// List<Course> courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc()); // List<Course> courses = courseService.userHobbyList(aid,dto.getOrderField(),dto.getOrderAsc());

2
servers/boe-server-all/src/main/resources/application-dev.properties
View File

@@ -9,7 +9,7 @@ spring.jpa.show-sql = true
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
spring.datasource.driverClassName=com.mysql.jdbc.Driver spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.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.username=root
spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==) spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)