attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

站点排序

Browse Source
This commit is contained in:
attiya 2025-05-15 14:19:18 +08:00
parent b91b033372
commit 09d45118df
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
View File

@ -195,11 +195,13 @@ public class EbikeRegionController {
* 分页查询站点。
*
* @param pageParam 分页参数
* @param borrowingSort 借车单量排序：1、升序；2、降序
* @param returnSort 还车单量排序：1、升序；2、降序
* @return {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("pageSite")
public JsonResult<?> pageSite(@Validated PageParam pageParam, Long operationRegionId, String zoneId, String siteName) {
Page<ResEbikeSiteRegionPageDto> page = siteRegionService.pageSite(pageParam, operationRegionId, zoneId, siteName);
public JsonResult<?> pageSite(@Validated PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort) {
Page<ResEbikeSiteRegionPageDto> page = siteRegionService.pageSite(pageParam, operationRegionId, zoneId, siteName,borrowingSort,returnSort);
return JsonResult.success(page);
}

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java
View File

@ -60,7 +60,7 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
* @param siteName 站点名称
* @return 分页列表
*/
Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName);
Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort);
/**
* 站点附件上传

6
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
View File

@ -205,7 +205,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
}
@Override
public Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName) {
public Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort) {
QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME,EBIKE_SITE_TYPE.SITE_TYPE_NAME)
.leftJoin(EBIKE_OPERATION_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_SITE_REGION.OPERATION_REGION_ID))
@ -215,7 +215,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
.where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE))
.where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId)))
.where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName)))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId)));
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId)))
.orderBy(EBIKE_SITE_REGION.BORROWING_ORDER,borrowingSort == 1)
.orderBy(EBIKE_SITE_REGION.RETURN_ORDER,returnSort == 1);
return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, ResEbikeSiteRegionPageDto.class);
}