diff --git a/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java b/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java index d852c4c..2c1bf29 100644 --- a/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java +++ b/ebike-gateway/src/main/java/com/cdzy/gateway/config/SaTokenConfigure.java @@ -25,6 +25,7 @@ public class SaTokenConfigure { .addInclude("/**") /* 拦截全部path */ // 开放地址 .addExclude("/user/**") + //支付放开(限开发模式) .addExclude("/payment/**") .addExclude("/operations/ebikeBikeInfo/api/**") // 鉴权方法:每次访问进入 diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBatteryInfoController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBatteryInfoController.java index 9fe6504..4b8da0d 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBatteryInfoController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBatteryInfoController.java @@ -120,7 +120,8 @@ public class EbikeBatteryInfoController { @GetMapping("page") public JsonResult page(PageParam pageParam, Integer status) { QueryWrapper queryWrapper = QueryWrapper.create() - .where(EBIKE_BATTERY_INFO.STATUS.eq(status, Objects.nonNull(status))); + .where(EBIKE_BATTERY_INFO.STATUS.eq(status, Objects.nonNull(status))) + .orderBy(EBIKE_BATTERY_INFO.CREATED_AT,Boolean.FALSE); Page page = ebikeBatteryInfoService.page(pageParam.getPage(), queryWrapper); return JsonResult.success(page); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeQrController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeQrController.java index 0022dc5..a5b27a1 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeQrController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeQrController.java @@ -75,7 +75,8 @@ public class EbikeBikeQrController { public JsonResult page(PageParam pageParam, String bikeQrCode) { QueryWrapper queryWrapper = QueryWrapper.create() .where(EBIKE_BIKE_QR.BIKE_QR_CODE.like(bikeQrCode, StringUtil.hasText(bikeQrCode))) - .orderBy(EBIKE_BIKE_QR.CREATED_AT,Boolean.TRUE); + .orderBy(EBIKE_BIKE_QR.CREATED_AT,Boolean.TRUE) + .orderBy(EBIKE_BIKE_QR.CREATED_AT,Boolean.FALSE); Page page = ebikeBikeQrService.page(pageParam.getPage(), queryWrapper); return JsonResult.success(page); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java index 75588c7..6d61a3f 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java @@ -137,7 +137,8 @@ public class EbikeRegionController { public JsonResult page(PageParam pageParam, String regionName, String regionSimpleName) { QueryWrapper queryWrapper = QueryWrapper.create() .where(EBIKE_REGION.REGION_NAME.like(regionName, StringUtil.hasText(regionName))) - .where(EBIKE_REGION.REGION_SIMPLE_NAME.like(regionSimpleName, StringUtil.hasText(regionSimpleName))); + .where(EBIKE_REGION.REGION_SIMPLE_NAME.like(regionSimpleName, StringUtil.hasText(regionSimpleName))) + .orderBy(EBIKE_REGION.CREATED_AT,Boolean.FALSE); Page page = ebikeRegionService.page(pageParam.getPage(), queryWrapper); return JsonResult.success(page); } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeSiteController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeSiteController.java index 1e57095..fddbe11 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeSiteController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeSiteController.java @@ -101,7 +101,8 @@ public class EbikeSiteController { @GetMapping("page") public JsonResult page(PageParam page,String siteName) { QueryWrapper queryWrapper = QueryWrapper.create() - .where(EBIKE_SITE.SITE_NAME.like(siteName, StringUtil.hasText(siteName))); + .where(EBIKE_SITE.SITE_NAME.like(siteName, StringUtil.hasText(siteName))) + .orderBy(EBIKE_SITE.CREATE_AT,Boolean.FALSE); Page sitePage = ebikeSiteService.page(page.getPage(),queryWrapper); return JsonResult.success(sitePage); }