From e00c55728baf26d0bd9673cbd3ca4510bad1f7fb Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Wed, 7 May 2025 10:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9C=80=E6=94=B9=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EbikeSysOperateSetController.java | 2 +- .../EbikeSysRcostsetController.java | 10 +++---- .../dto/request/ReqEbikeSysLinktelDto.java | 2 +- .../dto/request/ReqEbikeSysOperateSetDto.java | 2 +- .../request/ReqEbikeSysOperateSetSaveDto.java | 2 +- .../dto/request/ReqEbikeSysRbacksetDto.java | 2 +- .../dto/request/ReqEbikeSysRcostsetDto.java | 2 +- .../request/ReqEbikeSysRcostsetUpdateDto.java | 2 +- .../dto/request/ReqEbikeSysRlocksetDto.java | 2 +- .../request/ReqEbikeSysRoperatesetDto.java | 2 +- .../request/ReqEbikeSysRusecondsetDto.java | 2 +- .../dto/response/ResEbikeSysLinktelDto.java | 2 +- .../response/ResEbikeSysOperateSetDto.java | 2 +- .../dto/response/ResEbikeSysRbacksetDto.java | 2 +- .../dto/response/ResEbikeSysRcostsetDto.java | 2 +- .../dto/response/ResEbikeSysRlocksetDto.java | 2 +- .../response/ResEbikeSysRoperatesetDto.java | 2 +- .../response/ResEbikeSysRusecondsetDto.java | 2 +- .../model/pojo/EbikeSysLinktel.java | 2 +- .../model/pojo/EbikeSysOperateSet.java | 2 +- .../model/pojo/EbikeSysRbackset.java | 2 +- .../model/pojo/EbikeSysRcostset.java | 2 +- .../model/pojo/EbikeSysRlockset.java | 2 +- .../model/pojo/EbikeSysRoperateset.java | 2 +- .../model/pojo/EbikeSysRusecondset.java | 2 +- .../service/EbikeSysOperateSetService.java | 4 +-- .../impl/EbikeSysOperateSetServiceImpl.java | 4 +-- .../impl/EbikeSysRoperatesetServiceImpl.java | 26 +++++++++---------- 28 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysOperateSetController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysOperateSetController.java index d4c13dd5..66d2d395 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysOperateSetController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysOperateSetController.java @@ -67,7 +67,7 @@ public class EbikeSysOperateSetController { */ @GetMapping("list") public JsonResult list(@RequestBody ReqEbikeSysOperateSetDto reqEbikeSysOperateSetDto) { - List list = ebikeSysOperateSetService.getListByRegionId(reqEbikeSysOperateSetDto.getRegionId() + List list = ebikeSysOperateSetService.getListByRegionId(reqEbikeSysOperateSetDto.getOperationRegionId() , reqEbikeSysOperateSetDto.getOperateType()); return list==null? JsonResult.failed("未查询到运营配置运营类型") : JsonResult.success(list); } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java index c8ec5194..44bf8fba 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRcostsetController.java @@ -7,8 +7,8 @@ import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRcostsetTimePeriodDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRcostsetUpdateDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRcostsetWeekDto; import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSysRcostsetDto; -import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSysRcostsetWeekDto; import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSysRcostsetTimePeriodDto; +import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSysRcostsetWeekDto; import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostset; import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostsetTimePeriod; import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostsetWeek; @@ -108,16 +108,16 @@ public class EbikeSysRcostsetController { /** * 根据区域id获取配置信息 * - * @param regionId 区域id + * @param operationRegionId 区域id * @return */ @RequestMapping("getRegionFeeConfigById") - public JsonResult getRegionFeeConfigById(@RequestParam(value = "regionId") - String regionId) { + public JsonResult getRegionFeeConfigById(@RequestParam(value = "operationRegionId") + String operationRegionId) { try { ResEbikeSysRcostsetDto resEbikeSysRcostsetDto = new ResEbikeSysRcostsetDto(); QueryWrapper query = QueryWrapper.create(); - query.eq(EBIKE_SYS_RCOSTSET.REGION_ID.getName(), regionId); + query.eq(EBIKE_SYS_RCOSTSET.OPERATION_REGION_ID.getName(), operationRegionId); EbikeSysRcostset ebikeSysRcostset = ebikeSysRcostsetService.getOne(query); if (ebikeSysRcostset == null) { return JsonResult.success(null); diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysLinktelDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysLinktelDto.java index 26a75e08..c3f37ec7 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysLinktelDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysLinktelDto.java @@ -17,7 +17,7 @@ public class ReqEbikeSysLinktelDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 电话号码 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetDto.java index ff0549fb..9f9d856e 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetDto.java @@ -21,7 +21,7 @@ public class ReqEbikeSysOperateSetDto { * 区域ID */ @NotBlank(message = "区域ID不能为空") - private String regionId; + private String operationRegionId; /** * 运营类型 0：按时间段运营 1：按周运营 */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java index dc080989..3ccf2017 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java @@ -21,7 +21,7 @@ public class ReqEbikeSysOperateSetSaveDto { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 星期几;,分隔；null为按时间段运营 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java index 8968f7c7..8891cd46 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java @@ -25,7 +25,7 @@ public class ReqEbikeSysRbacksetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 是否站点还车 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java index 6e6f6de0..bcf6b830 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetDto.java @@ -23,7 +23,7 @@ public class ReqEbikeSysRcostsetDto implements Serializable { /** * 区域id */ - private String regionId; + private String operationRegionId; /** * 计费模式 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java index d90ad564..7507e5f6 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRcostsetUpdateDto.java @@ -26,7 +26,7 @@ public class ReqEbikeSysRcostsetUpdateDto implements Serializable { /** * 区域id */ - private String regionId; + private String operationRegionId; /** * 计费模式 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRlocksetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRlocksetDto.java index 96947c13..ede5106d 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRlocksetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRlocksetDto.java @@ -16,7 +16,7 @@ public class ReqEbikeSysRlocksetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 自动锁车（分钟） diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java index 5d182c0f..155202b6 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java @@ -23,7 +23,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 是否运营;1运营中 0停止运营 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRusecondsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRusecondsetDto.java index 71863641..84238ec1 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRusecondsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRusecondsetDto.java @@ -17,7 +17,7 @@ public class ReqEbikeSysRusecondsetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 禁止用户借车电量;百分比，默认30 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysLinktelDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysLinktelDto.java index 94a053c2..35ee2626 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysLinktelDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysLinktelDto.java @@ -17,7 +17,7 @@ public class ResEbikeSysLinktelDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 电话号码 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java index dfb39771..f8521a15 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java @@ -22,7 +22,7 @@ public class ResEbikeSysOperateSetDto { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 星期几;,分隔；null为按时间段运营 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java index 5cedf37a..61d59da2 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java @@ -19,7 +19,7 @@ public class ResEbikeSysRbacksetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 是否站点还车 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java index b01069e4..dd936496 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRcostsetDto.java @@ -26,7 +26,7 @@ public class ResEbikeSysRcostsetDto implements Serializable { /** * 区域id */ - private String regionId; + private String operationRegionId; /** * 计费模式 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRlocksetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRlocksetDto.java index 50751f27..fc45737f 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRlocksetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRlocksetDto.java @@ -16,7 +16,7 @@ public class ResEbikeSysRlocksetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 自动锁车（分钟） diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java index 8e133396..bb2a8f94 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java @@ -24,7 +24,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 是否运营;1运营中 0停止运营 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRusecondsetDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRusecondsetDto.java index e45eb200..97c69159 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRusecondsetDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRusecondsetDto.java @@ -17,7 +17,7 @@ public class ResEbikeSysRusecondsetDto implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 禁止用户借车电量;百分比，默认30 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java index 2d74c185..e352a465 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java @@ -36,7 +36,7 @@ public class EbikeSysLinktel implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 电话号码 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java index 84344129..66875bf2 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java @@ -36,7 +36,7 @@ public class EbikeSysOperateSet implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 星期几;,分隔；null为按时间段运营 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java index 52cb9549..e5263d03 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java @@ -37,7 +37,7 @@ public class EbikeSysRbackset implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 是否站点还车 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java index a43372cd..c3a2a365 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRcostset.java @@ -33,7 +33,7 @@ public class EbikeSysRcostset implements Serializable { /** * 区域id */ - private String regionId; + private String operationRegionId; /** * 计费模式 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java index 6b5dab7d..375f53bb 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java @@ -36,7 +36,7 @@ public class EbikeSysRlockset implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 自动锁车（分钟） diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java index 66c1bba4..df2ad393 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java @@ -40,7 +40,7 @@ public class EbikeSysRoperateset implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 是否运营;1运营中 0停止运营 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java index 29d728a3..7887977b 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java @@ -37,7 +37,7 @@ public class EbikeSysRusecondset implements Serializable { /** * 区域ID */ - private String regionId; + private String operationRegionId; /** * 禁止用户借车电量;百分比，默认30 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysOperateSetService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysOperateSetService.java index 269a62a8..fefd0451 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysOperateSetService.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysOperateSetService.java @@ -15,9 +15,9 @@ public interface EbikeSysOperateSetService extends IService /** * 查询所有运营配置运营类型。 * - * @regionId 区域ID + * @operationRegionId 区域ID * @operateType 运营类型 0：按时间段运营 1：按周运营 * @return 所有数据 */ - List getListByRegionId(String regionId, int operateType); + List getListByRegionId(String operationRegionId, int operateType); } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysOperateSetServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysOperateSetServiceImpl.java index ee0ad1af..bc903ac0 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysOperateSetServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysOperateSetServiceImpl.java @@ -21,9 +21,9 @@ import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysOperateSetTableDef. public class EbikeSysOperateSetServiceImpl extends ServiceImpl implements EbikeSysOperateSetService{ @Override - public List getListByRegionId(String regionId, int operateType) { + public List getListByRegionId(String operationRegionId, int operateType) { QueryWrapper query = QueryWrapper.create() - .where(EBIKE_SYS_OPERATE_SET.REGION_ID.eq(regionId)); + .where(EBIKE_SYS_OPERATE_SET.OPERATION_REGION_ID.eq(operationRegionId)); if(operateType == 0){ query.and(EBIKE_SYS_OPERATE_SET.WEEKDAY.isNull()); }else if(operateType == 1){ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java index f5967a5f..05d8333c 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java @@ -54,7 +54,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl operateTime = reqEbikeSysRoperatesetDto.getOperateTime(); List ebikeSysOperateSets = new ArrayList<>(); @@ -186,7 +186,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl reqEbikeSysLinktelDto = reqEbikeSysRoperatesetsDto.getEbikeSysLinktelDto(); List ebikeSysLinktels = new ArrayList<>(); @@ -212,12 +212,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl ebikeSysOperateSets = ebikeSysOperateSetMapper.selectListByQuery(query); String operateType = ebikeSysRoperateset.getOperateType(); @@ -244,28 +244,28 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl ebikeSysLinktels = ebikeSysLinktelMapper.selectListByQuery(query); List resEbikeSysLinktelDtos = new ArrayList<>(); for (EbikeSysLinktel ebikeSysLinktel : ebikeSysLinktels) {