From 7d8b05166ddc954e5ee3c6dfff5ce484a29c408f Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Tue, 6 May 2025 16:09:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeRegionController.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java index 536b12a6..269ba36a 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java @@ -26,6 +26,7 @@ import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryMethods; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; +import com.mybatisflex.core.util.StringUtil; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; @@ -36,6 +37,7 @@ import java.util.Objects; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeAdministrationZoneTableDef.EBIKE_ADMINISTRATION_ZONE; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeOperationRegionTableDef.EBIKE_OPERATION_REGION; +import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteRegionTableDef.EBIKE_SITE_REGION; /** * 区域控制层。 @@ -178,9 +180,14 @@ public class EbikeRegionController { * @return {@code 200} 添加成功，{@code 500} 添加失败 */ @GetMapping("pageSite") - public JsonResult pageSite(@Validated PageParam pageParam) { - siteRegionService.page(pageParam.getPage()); - return JsonResult.success(); + public JsonResult pageSite(@Validated PageParam pageParam, String zoneId, String siteName) { + QueryWrapper queryWrapper = QueryWrapper.create() + .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)) + .where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId,StringUtil.hasText(zoneId))) + .where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName))); + Page page = siteRegionService.page(pageParam.getPage(), queryWrapper); + return JsonResult.success(page); } /** @@ -219,7 +226,7 @@ public class EbikeRegionController { * 获取当前登录用户所有站点。 */ @GetMapping("getRegion") - public JsonResult getRegion(@RequestParam(value = "regionId",required = false)Long regionId) { + public JsonResult getRegion(@RequestParam(value = "regionId", required = false) Long regionId) { List list = siteRegionService.listByToken(regionId); return JsonResult.success(list); }