From 70baa80a3994ec7f33999c1e3dd081cf91303608 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Fri, 16 May 2025 11:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeSiteRegionServiceImpl.java      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
index b0930ad0..364c4fd1 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
@@ -196,7 +196,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
     @Override
     public ResEbikeSiteRegionInfoDto siteInfo(Long siteRegionId) {
         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_SITE_TYPE).on(EBIKE_SITE_TYPE.SITE_TYPE_VALUE.eq(EBIKE_SITE_REGION.SITE_LEVEL))
                 .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.SITE))
@@ -205,9 +205,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
     }
 
     @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()
-                .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_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))
@@ -215,9 +215,14 @@ 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)))
-                .orderBy(EBIKE_SITE_REGION.BORROWING_ORDER,borrowingSort == 1)
-                .orderBy(EBIKE_SITE_REGION.RETURN_ORDER,returnSort == 1);
+                .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionId, Objects.nonNull(operationRegionId)));
+        if (borrowingSort != null) {
+            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);
     }
 
@@ -236,7 +241,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
             Coordinate coordinate = new Coordinate(pointDto.getLongitude(), pointDto.getLatitude());
             vertices.add(coordinate);
         }
-        redisUtil.addSiteArea(areaId,siteRegionId,vertices);
+        redisUtil.addSiteArea(areaId, siteRegionId, vertices);
         if (siteType == 1) {
             redisUtil.addParkingArea(areaId, siteRegionId, vertices);
         }
@@ -259,7 +264,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
             Coordinate coordinate = new Coordinate(pointDto.getLongitude(), pointDto.getLatitude());
             vertices.add(coordinate);
         }
-        redisUtil.addSiteArea(areaId,siteRegionId,vertices);
+        redisUtil.addSiteArea(areaId, siteRegionId, vertices);
         if (siteType == 1 && !list.isEmpty()) {
             redisUtil.addParkingArea(areaId, siteRegionId, vertices);
         }
@@ -276,7 +281,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_POINT.REGION_ID.eq(siteRegionId));
         pointMapper.deleteByQuery(queryWrapper);
-        redisUtil.delSiteArea(areaId,siteRegionId);
+        redisUtil.delSiteArea(areaId, siteRegionId);
         redisUtil.delParkingArea(areaId, siteRegionId);
     }