From 3bbb550992854079d707c6467b7167d733c8f076 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Wed, 30 Apr 2025 14:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeSysRoperatesetController.java | 1 + .../model/dto/request/ReqEbikeSysLinktelDto.java | 8 +++++--- .../dto/request/ReqEbikeSysOperateSetSaveDto.java | 7 ++++--- .../model/dto/request/ReqEbikeSysRbacksetDto.java | 2 +- .../model/dto/request/ReqEbikeSysRlocksetDto.java | 2 +- .../dto/request/ReqEbikeSysRoperatesetDto.java | 11 ++++++----- .../dto/request/ReqEbikeSysRusecondsetDto.java | 2 +- .../model/dto/response/ResEbikeSysLinktelDto.java | 7 ++++--- .../dto/response/ResEbikeSysOperateSetDto.java | 11 +++++++---- .../dto/response/ResEbikeSysRbacksetDto.java | 2 +- .../dto/response/ResEbikeSysRlocksetDto.java | 2 +- .../dto/response/ResEbikeSysRoperatesetDto.java | 15 +++++++++++---- .../dto/response/ResEbikeSysRusecondsetDto.java | 2 +- .../ebikeoperate/model/pojo/EbikeSysLinktel.java | 5 +++-- .../model/pojo/EbikeSysOperateSet.java | 5 +++-- .../model/pojo/EbikeSysRoperateset.java | 2 +- 16 files changed, 51 insertions(+), 33 deletions(-) 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 7251fbcb..14eebae7 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 @@ -5,6 +5,7 @@ import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetsDto; import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSysRoperatesetsDto; import com.cdzy.ebikeoperate.model.pojo.EbikeSysRoperateset; import com.cdzy.ebikeoperate.service.EbikeSysRoperatesetService; +import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; 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 1476c5ff..24ea5c21 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 @@ -1,8 +1,10 @@ package com.cdzy.ebikeoperate.model.dto.request; +import cn.hutool.core.date.DateTime; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** * 区域电话客服设置表 实体类。 @@ -16,7 +18,7 @@ public class ReqEbikeSysLinktelDto implements Serializable { /** * 区域ID */ - private String reginId; + private String regionId; /** * 电话号码 @@ -26,11 +28,11 @@ public class ReqEbikeSysLinktelDto implements Serializable { /** * 工作时间(起) */ - private String worktimeStart; + private DateTime worktimeStart; /** * 工作时间(止) */ - private String worktimeEnd; + private DateTime worktimeEnd; } 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 6ce9fbd6..8ec95900 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 @@ -1,5 +1,6 @@ package com.cdzy.ebikeoperate.model.dto.request; +import cn.hutool.core.date.DateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,7 +19,7 @@ public class ReqEbikeSysOperateSetSaveDto { /** * 区域ID */ - private String reginId; + private String regionId; /** * 星期几;,分隔；null为按时间段运营 @@ -28,10 +29,10 @@ public class ReqEbikeSysOperateSetSaveDto { /** * 工作开始时间;HH:mm:ss */ - private String startWorktime; + private DateTime startWorktime; /** * 工作结束时间;HH:mm:ss */ - private String endWorktime; + private DateTime endWorktime; } 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 cf136a98..7af206aa 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 @@ -24,7 +24,7 @@ public class ReqEbikeSysRbacksetDto implements Serializable { /** * 区域ID */ - private String reginId; + private String regionId; /** * 是否站点还车 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 2675cb83..96947c13 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 reginId; + private String regionId; /** * 自动锁车（分钟） 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 e38f0871..301578b1 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 @@ -1,5 +1,6 @@ package com.cdzy.ebikeoperate.model.dto.request; +import com.alibaba.fastjson2.JSONArray; import lombok.Data; import java.io.Serializable; @@ -21,7 +22,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable { /** * 区域ID */ - private String reginId; + private String regionId; /** * 是否运营;1运营中 0停止运营 @@ -41,7 +42,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable { /** * 访问渠道;每一位表示一种支付，是支持，否不支持 */ - private String channel; + private JSONArray channel; /** * 认证条件;0默认 1实名认证 2学生认证 3无需认证 @@ -156,7 +157,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable { /** * 充值规则;默认5,10,20,50,100,200 */ - private String rechargeRule; + private JSONArray rechargeRule; /** * 在线客服;1开启 0关闭 @@ -176,7 +177,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable { /** * 开票开始时间 */ - private String issueAnInvoiceStartTime; + private LocalDateTime issueAnInvoiceStartTime; /** * 0公里申诉自动退款 @@ -206,5 +207,5 @@ public class ReqEbikeSysRoperatesetDto implements Serializable { /** * 按周运营时间配置列表 */ - private List operateTimeByWeek; + private List operateTime; } 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 20a7da43..71863641 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 reginId; + private String regionId; /** * 禁止用户借车电量;百分比，默认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 7428900e..122a8e0e 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 @@ -3,6 +3,7 @@ package com.cdzy.ebikeoperate.model.dto.response; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** * 区域电话客服设置表 实体类。 @@ -16,7 +17,7 @@ public class ResEbikeSysLinktelDto implements Serializable { /** * 区域ID */ - private String reginId; + private String regionId; /** * 电话号码 @@ -26,11 +27,11 @@ public class ResEbikeSysLinktelDto implements Serializable { /** * 工作时间(起) */ - private String worktimeStart; + private LocalDateTime worktimeStart; /** * 工作时间(止) */ - private String worktimeEnd; + private LocalDateTime worktimeEnd; } 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 5db09a81..95febf7a 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 @@ -1,11 +1,14 @@ package com.cdzy.ebikeoperate.model.dto.response; +import cn.hutool.core.date.DateTime; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + /** - * 运营配置运营类型 查询参数。 + * 运营配置运营类型 查询参数。 * * @author dingchao * @date 2025/4/15 @@ -19,7 +22,7 @@ public class ResEbikeSysOperateSetDto { /** * 区域ID */ - private String reginId; + private String regionId; /** * 星期几;,分隔；null为按时间段运营 @@ -29,10 +32,10 @@ public class ResEbikeSysOperateSetDto { /** * 工作开始时间;HH:mm:ss */ - private String startWorktime; + private DateTime startWorktime; /** * 工作结束时间;HH:mm:ss */ - private String endWorktime; + private DateTime endWorktime; } 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 5adaa52e..6b8b849c 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 @@ -18,7 +18,7 @@ public class ResEbikeSysRbacksetDto implements Serializable { /** * 区域ID */ - private String reginId; + private String regionId; /** * 是否站点还车 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 c3bdc77a..50751f27 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 reginId; + private String regionId; /** * 自动锁车（分钟） 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 892f53de..5bab0e73 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 @@ -1,10 +1,13 @@ package com.cdzy.ebikeoperate.model.dto.response; +import com.alibaba.fastjson2.JSONArray; +import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysOperateSetSaveDto; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * @author:Ding @@ -20,7 +23,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable { /** * 区域ID */ - private String reginId; + private String regionId; /** * 是否运营;1运营中 0停止运营 @@ -40,7 +43,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable { /** * 访问渠道;每一位表示一种支付，是支持，否不支持 */ - private String channel; + private JSONArray channel; /** * 认证条件;0默认 1实名认证 2学生认证 3无需认证 @@ -155,7 +158,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable { /** * 充值规则;默认5,10,20,50,100,200 */ - private String rechargeRule; + private JSONArray rechargeRule; /** * 在线客服;1开启 0关闭 @@ -175,7 +178,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable { /** * 开票开始时间 */ - private String issueAnInvoiceStartTime; + private LocalDateTime issueAnInvoiceStartTime; /** * 0公里申诉自动退款 @@ -202,4 +205,8 @@ public class ResEbikeSysRoperatesetDto implements Serializable { */ private LocalDateTime stopEndTime; + /** + * 按周运营时间配置列表 + */ + private List operateTime; } 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 9e7edc7f..e45eb200 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 reginId; + private String regionId; /** * 禁止用户借车电量;百分比，默认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 951c6be7..f5cb6fec 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 @@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Table; import java.io.Serializable; import java.io.Serial; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; @@ -46,11 +47,11 @@ public class EbikeSysLinktel implements Serializable { /** * 工作时间(起) */ - private String worktimeStart; + private LocalDateTime worktimeStart; /** * 工作时间(止) */ - private String worktimeEnd; + private LocalDateTime worktimeEnd; } 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 b3f7664a..034612ac 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 @@ -1,5 +1,6 @@ package com.cdzy.ebikeoperate.model.pojo; +import cn.hutool.core.date.DateTime; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import java.io.Serializable; @@ -46,11 +47,11 @@ public class EbikeSysOperateSet implements Serializable { /** * 工作开始时间;HH:mm:ss */ - private String startWorktime; + private DateTime startWorktime; /** * 工作结束时间;HH:mm:ss */ - private String endWorktime; + private DateTime endWorktime; } 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 adba5e85..2d87b6c8 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 @@ -193,7 +193,7 @@ public class EbikeSysRoperateset implements Serializable { /** * 开票开始时间 */ - private String issueAnInvoiceStartTime; + private LocalDateTime issueAnInvoiceStartTime; /** * 0公里申诉自动退款