attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

运营区域配置信息新增接口编写

Browse Source
This commit is contained in:
dzl 2025-04-30 17:32:58 +08:00
parent 526b695f65
commit 4e14306c1b
13 changed files with 66 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysOperateSetSaveDto.java
View File

@ -1,6 +1,7 @@
package com.cdzy.ebikeoperate.model.dto.request;
import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson2.JSONArray;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -24,7 +25,7 @@ public class ReqEbikeSysOperateSetSaveDto {
/**
* 星期几;,分隔；null为按时间段运营
*/
private String weekday;
private JSONArray weekday;
/**
* 工作开始时间;HH:mm:ss

5
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRbacksetDto.java
View File

@ -1,5 +1,6 @@
package com.cdzy.ebikeoperate.model.dto.request;
import com.alibaba.fastjson2.JSONArray;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import lombok.AllArgsConstructor;
@ -84,12 +85,12 @@ public class ReqEbikeSysRbacksetDto implements Serializable {
/**
* 规范还车跳过类型
*/
private String ignoreRegularType;
private JSONArray ignoreRegularType;
/**
* 学习免调度费还车类型
*/
private String freeReturnType;
private JSONArray freeReturnType;
/**
* 学习免调度费次数

3
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqEbikeSysRoperatesetDto.java
View File

@ -5,6 +5,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@ -177,7 +178,7 @@ public class ReqEbikeSysRoperatesetDto implements Serializable {
/**
* 开票开始时间
*/
private LocalDateTime issueAnInvoiceStartTime;
private LocalDate issueAnInvoiceStartTime;
/**
* 0公里申诉自动退款

3
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysOperateSetDto.java
View File

@ -1,6 +1,7 @@
package com.cdzy.ebikeoperate.model.dto.response;
import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson2.JSONArray;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -27,7 +28,7 @@ public class ResEbikeSysOperateSetDto {
/**
* 星期几;,分隔；null为按时间段运营
*/
private String weekday;
private JSONArray weekday;
/**
* 工作开始时间;HH:mm:ss

5
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRbacksetDto.java
View File

@ -1,5 +1,6 @@
package com.cdzy.ebikeoperate.model.dto.response;
import com.alibaba.fastjson2.JSONArray;
import lombok.Data;
import java.io.Serializable;
@ -78,12 +79,12 @@ public class ResEbikeSysRbacksetDto implements Serializable {
/**
* 规范还车跳过类型
*/
private String ignoreRegularType;
private JSONArray ignoreRegularType;
/**
* 学习免调度费还车类型
*/
private String freeReturnType;
private JSONArray freeReturnType;
/**
* 学习免调度费次数

3
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSysRoperatesetDto.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@ -178,7 +179,7 @@ public class ResEbikeSysRoperatesetDto implements Serializable {
/**
* 开票开始时间
*/
private LocalDateTime issueAnInvoiceStartTime;
private LocalDate issueAnInvoiceStartTime;
/**
* 0公里申诉自动退款

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysLinktel.java
View File

@ -37,7 +37,7 @@ public class EbikeSysLinktel implements Serializable {
/**
* 区域ID
*/
private String reginId;
private String regionId;
/**
* 电话号码

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysOperateSet.java
View File

@ -37,7 +37,7 @@ public class EbikeSysOperateSet implements Serializable {
/**
* 区域ID
*/
private String reginId;
private String regionId;
/**
* 星期几;,分隔；null为按时间段运营

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRbackset.java
View File

@ -37,7 +37,7 @@ public class EbikeSysRbackset implements Serializable {
/**
* 区域ID
*/
private String reginId;
private String regionId;
/**
* 是否站点还车

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRlockset.java
View File

@ -36,7 +36,7 @@ public class EbikeSysRlockset implements Serializable {
/**
* 区域ID
*/
private String reginId;
private String regionId;
/**
* 自动锁车（分钟）

6
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRoperateset.java
View File

@ -2,8 +2,10 @@ package com.cdzy.ebikeoperate.model.pojo;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.io.Serial;
@ -38,7 +40,7 @@ public class EbikeSysRoperateset implements Serializable {
/**
* 区域ID
*/
private String reginId;
private String regionId;
/**
* 是否运营;1运营中 0停止运营
@ -193,7 +195,7 @@ public class EbikeSysRoperateset implements Serializable {
/**
* 开票开始时间
*/
private LocalDateTime issueAnInvoiceStartTime;
private LocalDate issueAnInvoiceStartTime;
/**
* 0公里申诉自动退款

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSysRusecondset.java
View File

@ -37,7 +37,7 @@ public class EbikeSysRusecondset implements Serializable {
/**
* 区域ID
*/
private String reginId;
private String regionId;
/**
* 禁止用户借车电量;百分比，默认30

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

@ -1,22 +1,28 @@
package com.cdzy.ebikeoperate.service.impl;
import com.cdzy.ebikeoperate.mapper.EbikeSysLinktelMapper;
import com.cdzy.ebikeoperate.mapper.EbikeSysOperateSetMapper;
import com.cdzy.ebikeoperate.mapper.*;
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysOperateSetSaveDto;
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetDto;
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeSysRoperatesetsDto;
import com.cdzy.ebikeoperate.model.pojo.EbikeSysOperateSet;
import com.cdzy.ebikeoperate.model.pojo.EbikeSysRcostset;
import com.cdzy.ebikeoperate.service.EbikeSysRcostsetService;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.cdzy.ebikeoperate.model.pojo.EbikeSysRoperateset;
import com.cdzy.ebikeoperate.mapper.EbikeSysRoperatesetMapper;
import com.cdzy.ebikeoperate.service.EbikeSysRoperatesetService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysLinktelTableDef.EBIKE_SYS_LINKTEL;
import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysOperateSetTableDef.EBIKE_SYS_OPERATE_SET;
import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysRoperatesetTableDef.EBIKE_SYS_ROPERATESET;
/**
@ -33,11 +39,19 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
private EbikeSysOperateSetMapper ebikeSysOperateSetMapper;
@Resource
private EbikeSysLinktelMapper ebikeSysLinktelMapper;
@Autowired
private EbikeSysRlocksetMapper ebikeSysRlocksetMapper;
@Autowired
private EbikeSysRusecondsetMapper ebikeSysRusecondsetMapper;
@Autowired
private EbikeSysRbacksetMapper ebikeSysRbacksetMapper;
@Autowired
private EbikeSysRoperatesetMapper ebikeSysRoperatesetMapper;
@Override
public EbikeSysRoperateset getByRegionId(String regionId) {
QueryWrapper query = QueryWrapper.create()
.where(EBIKE_SYS_ROPERATESET.REGIN_ID.eq(regionId));
.where(EBIKE_SYS_ROPERATESET.REGION_ID.eq(regionId));
return getOne(query);
}
@ -45,9 +59,9 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
@Override
public Boolean deleteByRegionId(String regionId) {
try {
ebikeSysOperateSetMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGIN_ID.eq(regionId));
ebikeSysLinktelMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGIN_ID.eq(regionId));
remove(EBIKE_SYS_ROPERATESET.REGIN_ID.eq(regionId));
ebikeSysOperateSetMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGION_ID.eq(regionId));
ebikeSysLinktelMapper.deleteByCondition(EBIKE_SYS_LINKTEL.REGION_ID.eq(regionId));
remove(EBIKE_SYS_ROPERATESET.REGION_ID.eq(regionId));
return true;
} catch (Exception e) {
log.error("删除区域运营信息配置表失败, regionId:{}", regionId, e);
@ -62,11 +76,32 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
* @return
*/
@Override
@Transactional
public Boolean save(ReqEbikeSysRoperatesetsDto reqEbikeSysRoperatesetsDto) {
ReqEbikeSysRoperatesetDto reqEbikeSysRoperatesetDto = reqEbikeSysRoperatesetsDto.getReqEbikeSysRoperatesetDto();
String regionId = reqEbikeSysRoperatesetDto.getRegionId();
EbikeSysRoperateset ebikeSysRoperateset = new EbikeSysRoperateset();
BeanUtils.copyProperties(reqEbikeSysRoperatesetDto,ebikeSysRoperateset);
BeanUtils.copyProperties(reqEbikeSysRoperatesetDto, ebikeSysRoperateset);
ebikeSysRoperatesetMapper.insert(ebikeSysRoperateset);
QueryWrapper query = QueryWrapper.create();
query.eq(EBIKE_SYS_OPERATE_SET.REGION_ID.getName(), regionId);
ebikeSysOperateSetMapper.deleteByQuery(query);
List<ReqEbikeSysOperateSetSaveDto> operateTime = reqEbikeSysRoperatesetDto.getOperateTime();
List<EbikeSysOperateSet> ebikeSysOperateSets = new ArrayList<>();
for (ReqEbikeSysOperateSetSaveDto reqEbikeSysOperateSetSaveDto : operateTime) {
EbikeSysOperateSet ebikeSysOperateSet = new EbikeSysOperateSet();
BeanUtils.copyProperties(reqEbikeSysOperateSetSaveDto, ebikeSysOperateSet);
if (reqEbikeSysOperateSetSaveDto.getWeekday() != null) {
ebikeSysOperateSet.setWeekday(reqEbikeSysOperateSetSaveDto.getWeekday().toString());
}
ebikeSysOperateSets.add(ebikeSysOperateSet);
}
if (!ebikeSysOperateSets.isEmpty()) {
ebikeSysOperateSetMapper.insertBatch(ebikeSysOperateSets);
}
return true;
}
}