字段需改重构

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<EbikeSysOperateSet> list = ebikeSysOperateSetService.getListByRegionId(reqEbikeSysOperateSetDto.getRegionId()
+        List<EbikeSysOperateSet> list = ebikeSysOperateSetService.getListByRegionId(reqEbikeSysOperateSetDto.getOperationRegionId()
                 , reqEbikeSysOperateSetDto.getOperateType());
         return list==null? JsonResult.failed("未查询到运营配置运营类型") : JsonResult.success(list);
     }

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")
+    public JsonResult<?> getRegionFeeConfigById(@RequestParam(value = "operationRegionId")
-                                                String regionId) {
+                                                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);

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;
 
     /**
      * 电话号码

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：按周运营
      */

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为按时间段运营

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;
 
     /**
      * 是否站点还车

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;
 
     /**
      * 计费模式

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;
 
     /**
      * 计费模式

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;
 
     /**
      * 自动锁车（分钟）

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停止运营

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

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;
 
     /**
      * 电话号码

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为按时间段运营

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;
 
     /**
      * 是否站点还车

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;
 
     /**
      * 计费模式

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;
 
     /**
      * 自动锁车（分钟）

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停止运营

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

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;
 
     /**
      * 电话号码

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为按时间段运营

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;
 
     /**
      * 是否站点还车

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;
 
     /**
      * 计费模式

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;
 
     /**
      * 自动锁车（分钟）

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停止运营

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

ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysOperateSetService.java

@@ -15,9 +15,9 @@ public interface EbikeSysOperateSetService extends IService<EbikeSysOperateSet>
     /**
      * 查询所有运营配置运营类型。
      *
-     * @regionId 区域ID
+     * @operationRegionId 区域ID
      * @operateType 运营类型 0：按时间段运营 1：按周运营
      * @return 所有数据
      */
-    List<EbikeSysOperateSet> getListByRegionId(String regionId, int operateType);
+    List<EbikeSysOperateSet> getListByRegionId(String operationRegionId, int operateType);
 }

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<EbikeSysOperateSetMapper, EbikeSysOperateSet>  implements EbikeSysOperateSetService{
 
     @Override
-    public List<EbikeSysOperateSet> getListByRegionId(String regionId, int operateType) {
+    public List<EbikeSysOperateSet> 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){

ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSysRoperatesetServiceImpl.java

@@ -54,7 +54,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
     @Override
     public EbikeSysRoperateset getByRegionId(String regionId) {
         QueryWrapper query = QueryWrapper.create()
-                .where(EBIKE_SYS_ROPERATESET.REGION_ID.eq(regionId));
+                .where(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.eq(regionId));
         return getOne(query);
     }
 
@@ -62,9 +62,9 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
     @Override
     public Boolean deleteByRegionId(String regionId) {
         try {
-            ebikeSysOperateSetMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGION_ID.eq(regionId));
+            ebikeSysOperateSetMapper.deleteByCondition(EBIKE_SYS_LINKTEL.OPERATION_REGION_ID.eq(regionId));
-            ebikeSysLinktelMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGION_ID.eq(regionId));
+            ebikeSysLinktelMapper.deleteByCondition(EBIKE_SYS_LINKTEL.OPERATION_REGION_ID.eq(regionId));
-            remove(EBIKE_SYS_ROPERATESET.REGION_ID.eq(regionId));
+            remove(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.eq(regionId));
             return true;
         } catch (Exception e) {
             log.error("删除区域运营信息配置表失败, regionId:{}", regionId, e);
@@ -146,7 +146,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
     public Boolean updateById(ReqEbikeSysRoperatesetsDto reqEbikeSysRoperatesetsDto) {
         try {
             ReqEbikeSysRoperatesetDto reqEbikeSysRoperatesetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRoperatesetDto();
-            String regionId = reqEbikeSysRoperatesetDto.getRegionId();
+            String regionId = reqEbikeSysRoperatesetDto.getOperationRegionId();
             //运营配置/开关配置
             EbikeSysRoperateset ebikeSysRoperateset = new EbikeSysRoperateset();
             BeanUtils.copyProperties(reqEbikeSysRoperatesetDto, ebikeSysRoperateset);
@@ -154,7 +154,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
             ebikeSysRoperatesetMapper.update(ebikeSysRoperateset);
             //运营时间
             QueryWrapper query = QueryWrapper.create();
-            query.eq(EBIKE_SYS_OPERATE_SET.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_OPERATE_SET.OPERATION_REGION_ID.getName(), regionId);
             ebikeSysOperateSetMapper.deleteByQuery(query);
             List<ReqEbikeSysOperateSetSaveDto> operateTime = reqEbikeSysRoperatesetDto.getOperateTime();
             List<EbikeSysOperateSet> ebikeSysOperateSets = new ArrayList<>();
@@ -186,7 +186,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
             ebikeSysRbacksetMapper.update(ebikeSysRbackset);
             //客服配置
             query.clear();
-            query.eq(EBIKE_SYS_LINKTEL.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_LINKTEL.OPERATION_REGION_ID.getName(), regionId);
             ebikeSysLinktelMapper.deleteByQuery(query);
             List<ReqEbikeSysLinktelDto> reqEbikeSysLinktelDto = reqEbikeSysRoperatesetsDto.getEbikeSysLinktelDto();
             List<EbikeSysLinktel> ebikeSysLinktels = new ArrayList<>();
@@ -212,12 +212,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
         try {
             //运营配置/开关配置
             QueryWrapper query = QueryWrapper.create();
-            query.eq(EBIKE_SYS_ROPERATESET.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.getName(), regionId);
             EbikeSysRoperateset ebikeSysRoperateset =
                     ebikeSysRoperatesetMapper.selectOneByQuery(query);
             BeanUtils.copyProperties(ebikeSysRoperateset, resEbikeSysRoperatesetDto);
             query.clear();
-            query.eq(EBIKE_SYS_OPERATE_SET.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_OPERATE_SET.OPERATION_REGION_ID.getName(), regionId);
             List<EbikeSysOperateSet> ebikeSysOperateSets =
                     ebikeSysOperateSetMapper.selectListByQuery(query);
             String operateType = ebikeSysRoperateset.getOperateType();
@@ -244,28 +244,28 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
             resEbikeSysRoperatesetsDto.setEbikeSysRoperatesetDto(resEbikeSysRoperatesetDto);
             //用车配置
             query.clear();
-            query.eq(EBIKE_SYS_RUSECONDSET.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_RUSECONDSET.OPERATION_REGION_ID.getName(), regionId);
             EbikeSysRusecondset ebikeSysRusecondset = ebikeSysRusecondsetMapper.selectOneByQuery(query);
             ResEbikeSysRusecondsetDto resEbikeSysRusecondsetDto = new ResEbikeSysRusecondsetDto();
             BeanUtils.copyProperties(ebikeSysRusecondset, resEbikeSysRusecondsetDto);
             resEbikeSysRoperatesetsDto.setEbikeSysRusecondsetDto(resEbikeSysRusecondsetDto);
             //锁车配置
             query.clear();
-            query.eq(EBIKE_SYS_RLOCKSET.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_RLOCKSET.OPERATION_REGION_ID.getName(), regionId);
             EbikeSysRlockset ebikeSysRlockset = ebikeSysRlocksetMapper.selectOneByQuery(query);
             ResEbikeSysRlocksetDto resEbikeSysRlocksetDto = new ResEbikeSysRlocksetDto();
             BeanUtils.copyProperties(ebikeSysRlockset, resEbikeSysRlocksetDto);
             resEbikeSysRoperatesetsDto.setEbikeSysRlocksetDto(resEbikeSysRlocksetDto);
             //还车配置
             query.clear();
-            query.eq(EBIKE_SYS_RBACKSET.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_RBACKSET.OPERATION_REGION_ID.getName(), regionId);
             EbikeSysRbackset ebikeSysRbackset = ebikeSysRbacksetMapper.selectOneByQuery(query);
             ResEbikeSysRbacksetDto resEbikeSysRbacksetDto = new ResEbikeSysRbacksetDto();
             BeanUtils.copyProperties(ebikeSysRbackset, resEbikeSysRbacksetDto);
             resEbikeSysRoperatesetsDto.setEbikeSysRbacksetDto(resEbikeSysRbacksetDto);
             //客服配置
             query.clear();
-            query.eq(EBIKE_SYS_LINKTEL.REGION_ID.getName(), regionId);
+            query.eq(EBIKE_SYS_LINKTEL.OPERATION_REGION_ID.getName(), regionId);
             List<EbikeSysLinktel> ebikeSysLinktels = ebikeSysLinktelMapper.selectListByQuery(query);
             List<ResEbikeSysLinktelDto> resEbikeSysLinktelDtos = new ArrayList<>();
             for (EbikeSysLinktel ebikeSysLinktel : ebikeSysLinktels) {