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-16 11:58:36 +08:00
parent 09d45118df
commit 70baa80a39
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
@Override @Override
public ResEbikeSiteRegionInfoDto siteInfo(Long siteRegionId) { public ResEbikeSiteRegionInfoDto siteInfo(Long siteRegionId) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME,EBIKE_SITE_TYPE.SITE_TYPE_NAME) .select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME, EBIKE_SITE_TYPE.SITE_TYPE_NAME)
.leftJoin(EBIKE_REGION_LEVEL).on(EBIKE_REGION_LEVEL.LEVEL_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL)) .leftJoin(EBIKE_REGION_LEVEL).on(EBIKE_REGION_LEVEL.LEVEL_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL))
.leftJoin(EBIKE_SITE_TYPE).on(EBIKE_SITE_TYPE.SITE_TYPE_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL)) .leftJoin(EBIKE_SITE_TYPE).on(EBIKE_SITE_TYPE.SITE_TYPE_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL))
.where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE)) .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE))
@ -205,9 +205,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
} }
@Override @Override
public Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName,Integer borrowingSort,Integer returnSort) { public Page<ResEbikeSiteRegionPageDto> pageSite(PageParam pageParam, Long operationRegionId, String zoneId, String siteName, Integer borrowingSort, Integer returnSort) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_SITE_REGION.ALL_COLUMNS, EBIKE_REGION_LEVEL.LEVEL_NAME,EBIKE_SITE_TYPE.SITE_TYPE_NAME) .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)) .leftJoin(EBIKE_OPERATION_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_SITE_REGION.OPERATION_REGION_ID))
.leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID)) .leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID))
.leftJoin(EBIKE_REGION_LEVEL).on(EBIKE_REGION_LEVEL.LEVEL_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL)) .leftJoin(EBIKE_REGION_LEVEL).on(EBIKE_REGION_LEVEL.LEVEL_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL))
@ -215,9 +215,14 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
.where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE)) .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE))
.where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId))) .where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId, StringUtil.hasText(zoneId)))
.where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName))) .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) if (borrowingSort != null) {
.orderBy(EBIKE_SITE_REGION.RETURN_ORDER,returnSort == 1); queryWrapper.orderBy(EBIKE_SITE_REGION.BORROWING_ORDER, borrowingSort == 1);
}
if (returnSort != null) {
queryWrapper.orderBy(EBIKE_SITE_REGION.RETURN_ORDER, returnSort == 1);
}
return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, ResEbikeSiteRegionPageDto.class); return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, ResEbikeSiteRegionPageDto.class);
} }
@ -236,7 +241,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
Coordinate coordinate = new Coordinate(pointDto.getLongitude(), pointDto.getLatitude()); Coordinate coordinate = new Coordinate(pointDto.getLongitude(), pointDto.getLatitude());
vertices.add(coordinate); vertices.add(coordinate);
} }
redisUtil.addSiteArea(areaId,siteRegionId,vertices); redisUtil.addSiteArea(areaId, siteRegionId, vertices);
if (siteType == 1) { if (siteType == 1) {
redisUtil.addParkingArea(areaId, siteRegionId, vertices); redisUtil.addParkingArea(areaId, siteRegionId, vertices);
} }
@ -259,7 +264,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
Coordinate coordinate = new Coordinate(pointDto.getLongitude(), pointDto.getLatitude()); Coordinate coordinate = new Coordinate(pointDto.getLongitude(), pointDto.getLatitude());
vertices.add(coordinate); vertices.add(coordinate);
} }
redisUtil.addSiteArea(areaId,siteRegionId,vertices); redisUtil.addSiteArea(areaId, siteRegionId, vertices);
if (siteType == 1 && !list.isEmpty()) { if (siteType == 1 && !list.isEmpty()) {
redisUtil.addParkingArea(areaId, siteRegionId, vertices); redisUtil.addParkingArea(areaId, siteRegionId, vertices);
} }
@ -276,7 +281,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_POINT.REGION_ID.eq(siteRegionId)); .where(EBIKE_POINT.REGION_ID.eq(siteRegionId));
pointMapper.deleteByQuery(queryWrapper); pointMapper.deleteByQuery(queryWrapper);
redisUtil.delSiteArea(areaId,siteRegionId); redisUtil.delSiteArea(areaId, siteRegionId);
redisUtil.delParkingArea(areaId, siteRegionId); redisUtil.delParkingArea(areaId, siteRegionId);
} }