diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java index c08ceb62..3a9e0e11 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java @@ -45,10 +45,10 @@ public class EbikeSysRoperatesetController { } @RequestMapping("getRegionConfigById") - public JsonResult getRegionConfigById(@RequestParam(value = "regionId") - String regionId) { + public JsonResult getRegionConfigById(@RequestParam(value = "operationRegionId") + String operationRegionId) { ResEbikeSysRoperatesetsDto resEbikeSysRoperatesetsDto = - ebikeSysRoperatesetService.getRegionConfigById(regionId); + ebikeSysRoperatesetService.getRegionConfigById(operationRegionId); return resEbikeSysRoperatesetsDto == null ? JsonResult.failed("") : JsonResult.success(resEbikeSysRoperatesetsDto); } 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 3ccf2017..f95d9849 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 @@ -18,6 +18,7 @@ import java.time.LocalTime; @NoArgsConstructor @AllArgsConstructor public class ReqEbikeSysOperateSetSaveDto { + /** * 区域ID */ 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 8891cd46..d137ca0e 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 @@ -22,6 +22,7 @@ import java.math.BigDecimal; public class ReqEbikeSysRbacksetDto implements Serializable { + private String id; /** * 区域ID */ 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 ede5106d..c6f8c84b 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 @@ -13,6 +13,8 @@ import java.io.Serializable; @Data public class ReqEbikeSysRlocksetDto implements Serializable { + + private String id; /** * 区域ID */ 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 155202b6..d376904c 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 @@ -20,6 +20,7 @@ import java.util.List; @Data public class ReqEbikeSysRoperatesetDto implements Serializable { + private String id; /** * 区域ID */ 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 84238ec1..bb56276f 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 @@ -14,6 +14,8 @@ import java.math.BigDecimal; @Data public class ReqEbikeSysRusecondsetDto implements Serializable { + + private String id; /** * 区域ID */ 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 61d59da2..5dfd6f31 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 @@ -16,6 +16,7 @@ import java.math.BigDecimal; public class ResEbikeSysRbacksetDto implements Serializable { + private String id; /** * 区域ID */ 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 fc45737f..c79b8aaa 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 @@ -13,6 +13,7 @@ import java.io.Serializable; @Data public class ResEbikeSysRlocksetDto implements Serializable { + private String id; /** * 区域ID */ 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 bb2a8f94..19be72d5 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 @@ -21,6 +21,7 @@ import java.util.List; @Data public class ResEbikeSysRoperatesetDto implements Serializable { + private String id; /** * 区域ID */ 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 97c69159..4c20d801 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 @@ -14,6 +14,7 @@ import java.math.BigDecimal; @Data public class ResEbikeSysRusecondsetDto implements Serializable { + private String id; /** * 区域ID */ diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysRoperatesetService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysRoperatesetService.java index 696d950f..b276b00d 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysRoperatesetService.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysRoperatesetService.java @@ -47,8 +47,8 @@ public interface EbikeSysRoperatesetService extends IService ebikeSysOperateSets = ebikeSysOperateSetMapper.selectListByQuery(query); String operateType = ebikeSysRoperateset.getOperateType(); @@ -244,28 +250,28 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl ebikeSysLinktels = ebikeSysLinktelMapper.selectListByQuery(query); List resEbikeSysLinktelDtos = new ArrayList<>(); for (EbikeSysLinktel ebikeSysLinktel : ebikeSysLinktels) {