From 681956c5bf6ac5b9cd735a9a06a4e8cc1aac231c Mon Sep 17 00:00:00 2001
From: dzl <863620989@qq.com>
Date: Wed, 7 May 2025 15:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E5=9F=9F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/ReqEbikeSysRbacksetDto.java    |  2 +-
 .../dto/response/ResEbikeSysRbacksetDto.java   |  2 +-
 .../model/pojo/EbikeSysRbackset.java           |  2 +-
 .../impl/EbikeSysRoperatesetServiceImpl.java   | 18 ++++++++++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

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 d137ca0e..1fa389c8 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
@@ -76,7 +76,7 @@ public class ReqEbikeSysRbacksetDto implements Serializable {
     /**
      * 站点偏移角度误差
      */
-    private Integer angulaOffsetError;
+    private Integer angularOffsetError;
 
     /**
      * 规范还车失败跳过次数
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 5dfd6f31..b8d91107 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
@@ -70,7 +70,7 @@ public class ResEbikeSysRbacksetDto implements Serializable {
     /**
      * 站点偏移角度误差
      */
-    private Integer angulaOffsetError;
+    private Integer angularOffsetError;
 
     /**
      * 规范还车失败跳过次数
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 e5263d03..f0790221 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
@@ -87,7 +87,7 @@ public class EbikeSysRbackset implements Serializable {
     /**
      * 站点偏移角度误差
      */
-    private Integer angulaOffsetError;
+    private Integer angularOffsetError;
 
     /**
      * 规范还车失败跳过次数
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 6fbb7184..008c153b 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
@@ -123,6 +123,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
             ReqEbikeSysRbacksetDto reqEbikeSysRbacksetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRbacksetDto();
             EbikeSysRbackset ebikeSysRbackset = new EbikeSysRbackset();
             BeanUtils.copyProperties(reqEbikeSysRbacksetDto, ebikeSysRbackset);
+            if (!StringUtils.isEmpty(reqEbikeSysRbacksetDto.getFreeReturnType())) {
+                ebikeSysRbackset.setFreeReturnType(reqEbikeSysRbacksetDto.getFreeReturnType().toString());
+            }
+            if (!StringUtils.isEmpty(reqEbikeSysRbacksetDto.getIgnoreRegularType())) {
+                ebikeSysRbackset.setIgnoreRegularType(reqEbikeSysRbacksetDto.getIgnoreRegularType().toString());
+            }
             ebikeSysRbacksetMapper.insert(ebikeSysRbackset);
             //客服配置
             List<ReqEbikeSysLinktelDto> reqEbikeSysLinktelDto = reqEbikeSysRoperatesetsDto.getEbikeSysLinktelDto();
@@ -189,6 +195,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
             ReqEbikeSysRbacksetDto reqEbikeSysRbacksetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRbacksetDto();
             EbikeSysRbackset ebikeSysRbackset = new EbikeSysRbackset();
             BeanUtils.copyProperties(reqEbikeSysRbacksetDto, ebikeSysRbackset);
+            if (!StringUtils.isEmpty(reqEbikeSysRbacksetDto.getFreeReturnType())) {
+                ebikeSysRbackset.setFreeReturnType(reqEbikeSysRbacksetDto.getFreeReturnType().toString());
+            }
+            if (!StringUtils.isEmpty(reqEbikeSysRbacksetDto.getIgnoreRegularType())) {
+                ebikeSysRbackset.setIgnoreRegularType(reqEbikeSysRbacksetDto.getIgnoreRegularType().toString());
+            }
             ebikeSysRbacksetMapper.update(ebikeSysRbackset);
             //客服配置
             query.clear();
@@ -268,6 +280,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
             EbikeSysRbackset ebikeSysRbackset = ebikeSysRbacksetMapper.selectOneByQuery(query);
             ResEbikeSysRbacksetDto resEbikeSysRbacksetDto = new ResEbikeSysRbacksetDto();
             BeanUtils.copyProperties(ebikeSysRbackset, resEbikeSysRbacksetDto);
+            if (!StringUtils.isEmpty(ebikeSysRbackset.getFreeReturnType())) {
+                resEbikeSysRbacksetDto.setFreeReturnType(JSONArray.parse(ebikeSysRbackset.getFreeReturnType()));
+            }
+            if (!StringUtils.isEmpty(ebikeSysRbackset.getIgnoreRegularType())) {
+                resEbikeSysRbacksetDto.setIgnoreRegularType(JSONArray.parse(ebikeSysRbackset.getIgnoreRegularType()));
+            }
             resEbikeSysRoperatesetsDto.setEbikeSysRbacksetDto(resEbikeSysRbacksetDto);
             //客服配置
             query.clear();