yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-06-29 08:55:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

排序优化

Browse Source
This commit is contained in:
none 2023-03-03 15:59:36 +08:00
parent 86d507cc98
commit b4db9d67b2
7 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/xyz/playedu/api/controller/backend/CourseController.java
View File

@ -45,8 +45,8 @@ public class CourseController {
public JsonResponse index(@RequestParam HashMap<String, Object> params) { public JsonResponse index(@RequestParam HashMap<String, Object> params) {
Integer page = MapUtils.getInteger(params, "page", 1); Integer page = MapUtils.getInteger(params, "page", 1);
Integer size = MapUtils.getInteger(params, "size", 10); Integer size = MapUtils.getInteger(params, "size", 10);
String sortField = MapUtils.getString(params, "sort_field", "id"); String sortField = MapUtils.getString(params, "sort_field");
String sortAlgo = MapUtils.getString(params, "sort_algo", "desc"); String sortAlgo = MapUtils.getString(params, "sort_algo");
String title = MapUtils.getString(params, "title"); String title = MapUtils.getString(params, "title");
String depIds = MapUtils.getString(params, "dep_ids"); String depIds = MapUtils.getString(params, "dep_ids");
String categoryIds = MapUtils.getString(params, "category_ids"); String categoryIds = MapUtils.getString(params, "category_ids");

4
src/main/java/xyz/playedu/api/controller/backend/ResourceController.java
View File

@ -39,8 +39,8 @@ public class ResourceController {
public JsonResponse index(@RequestParam HashMap<String, Object> params) { public JsonResponse index(@RequestParam HashMap<String, Object> params) {
Integer page = MapUtils.getInteger(params, "page", 1); Integer page = MapUtils.getInteger(params, "page", 1);
Integer size = MapUtils.getInteger(params, "size", 10); Integer size = MapUtils.getInteger(params, "size", 10);
String sortField = MapUtils.getString(params, "sort_field", "id"); String sortField = MapUtils.getString(params, "sort_field");
String sortAlgo = MapUtils.getString(params, "sort_algo", "desc"); String sortAlgo = MapUtils.getString(params, "sort_algo");
String name = MapUtils.getString(params, "name"); String name = MapUtils.getString(params, "name");
String categoryIdsStr = MapUtils.getString(params, "category_ids"); String categoryIdsStr = MapUtils.getString(params, "category_ids");

4
src/main/java/xyz/playedu/api/controller/backend/UserController.java
View File

@ -63,8 +63,8 @@ public class UserController {
String createdAtStr = MapUtils.getString(params, "created_at"); String createdAtStr = MapUtils.getString(params, "created_at");
String depIdsStr = MapUtils.getString(params, "dep_ids"); String depIdsStr = MapUtils.getString(params, "dep_ids");
String sortField = MapUtils.getString(params, "sort_field", "id"); String sortField = MapUtils.getString(params, "sort_field");
String sortAlgo = MapUtils.getString(params, "sort_algo", "desc"); String sortAlgo = MapUtils.getString(params, "sort_algo");
UserPaginateFilter filter = new UserPaginateFilter(); UserPaginateFilter filter = new UserPaginateFilter();
filter.setSortAlgo(sortAlgo); filter.setSortAlgo(sortAlgo);

14
src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java
View File

@ -61,10 +61,18 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
} }
} }
if (filter.getSortAlgo().equals("desc")) { String sortFiled = filter.getSortField();
wrapper.orderByDesc(filter.getSortField()); if (sortFiled == null || sortFiled.trim().length() == 0) {
sortFiled = "id";
}
String sortAlgo = filter.getSortAlgo();
if (sortAlgo == null || sortAlgo.trim().length() == 0) {
sortAlgo = "desc";
}
if ("desc".equals(sortAlgo)) {
wrapper.orderByDesc(sortFiled);
} else { } else {
wrapper.orderByAsc(filter.getSortField()); wrapper.orderByAsc(sortFiled);
} }
IPage<Course> pageObj = new Page<>(page, size); IPage<Course> pageObj = new Page<>(page, size);

2
src/main/java/xyz/playedu/api/service/impl/ResourceCategoryServiceImpl.java
View File

@ -20,7 +20,7 @@ public class ResourceCategoryServiceImpl extends ServiceImpl<ResourceCategoryMap
implements ResourceCategoryService { implements ResourceCategoryService {
@Override @Override
public List<ResourceCategory> getByType(String type) { public List<ResourceCategory> getByType(String type) {
return list(query().getWrapper().eq("type", type).orderByAsc("id")); return list(query().getWrapper().eq("type", type).orderByAsc("sort"));
} }
@Override @Override

15
src/main/java/xyz/playedu/api/service/impl/ResourceServiceImpl.java
View File

@ -40,11 +40,18 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
wrapper.in("category_id", Arrays.asList(filter.getCategoryIds())); wrapper.in("category_id", Arrays.asList(filter.getCategoryIds()));
} }
// 排序 String sortFiled = filter.getSortField();
if (filter.getSortAlgo().equals("desc")) { if (sortFiled == null || sortFiled.trim().length() == 0) {
wrapper.orderByDesc(filter.getSortField()); sortFiled = "id";
}
String sortAlgo = filter.getSortAlgo();
if (sortAlgo == null || sortAlgo.trim().length() == 0) {
sortAlgo = "desc";
}
if ("desc".equals(sortAlgo)) {
wrapper.orderByDesc(sortFiled);
} else { } else {
wrapper.orderByAsc(filter.getSortField()); wrapper.orderByAsc(sortFiled);
} }
IPage<Resource> adminPage = new Page<>(page, size); IPage<Resource> adminPage = new Page<>(page, size);

14
src/main/java/xyz/playedu/api/service/impl/UserServiceImpl.java
View File

@ -78,10 +78,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
wrapper.in("id", userIds); wrapper.in("id", userIds);
} }
if (filter.getSortAlgo().equals("desc")) { String sortFiled = filter.getSortField();
wrapper.orderByDesc(filter.getSortField()); if (sortFiled == null || sortFiled.trim().length() == 0) {
sortFiled = "id";
}
String sortAlgo = filter.getSortAlgo();
if (sortAlgo == null || sortAlgo.trim().length() == 0) {
sortAlgo = "desc";
}
if ("desc".equals(sortAlgo)) {
wrapper.orderByDesc(sortFiled);
} else { } else {
wrapper.orderByAsc(filter.getSortField()); wrapper.orderByAsc(sortFiled);
} }
IPage<User> userPage = new Page<>(page, size); IPage<User> userPage = new Page<>(page, size);