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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
attiya 2025-05-07 16:48:01 +08:00
commit 9c8eb73604
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ public class ReqEbikeSysRbacksetDto implements Serializable {
/** /**
* 站点偏移角度误差 * 站点偏移角度误差
*/ */
private Integer angulaOffsetError; private Integer angularOffsetError;
/** /**
* 规范还车失败跳过次数 * 规范还车失败跳过次数

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

@ -70,7 +70,7 @@ public class ResEbikeSysRbacksetDto implements Serializable {
/** /**
* 站点偏移角度误差 * 站点偏移角度误差
*/ */
private Integer angulaOffsetError; private Integer angularOffsetError;
/** /**
* 规范还车失败跳过次数 * 规范还车失败跳过次数

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

@ -87,7 +87,7 @@ public class EbikeSysRbackset implements Serializable {
/** /**
* 站点偏移角度误差 * 站点偏移角度误差
*/ */
private Integer angulaOffsetError; private Integer angularOffsetError;
/** /**
* 规范还车失败跳过次数 * 规范还车失败跳过次数

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

@ -123,6 +123,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
ReqEbikeSysRbacksetDto reqEbikeSysRbacksetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRbacksetDto(); ReqEbikeSysRbacksetDto reqEbikeSysRbacksetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRbacksetDto();
EbikeSysRbackset ebikeSysRbackset = new EbikeSysRbackset(); EbikeSysRbackset ebikeSysRbackset = new EbikeSysRbackset();
BeanUtils.copyProperties(reqEbikeSysRbacksetDto, 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); ebikeSysRbacksetMapper.insert(ebikeSysRbackset);
//客服配置 //客服配置
List<ReqEbikeSysLinktelDto> reqEbikeSysLinktelDto = reqEbikeSysRoperatesetsDto.getEbikeSysLinktelDto(); List<ReqEbikeSysLinktelDto> reqEbikeSysLinktelDto = reqEbikeSysRoperatesetsDto.getEbikeSysLinktelDto();
@ -189,6 +195,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
ReqEbikeSysRbacksetDto reqEbikeSysRbacksetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRbacksetDto(); ReqEbikeSysRbacksetDto reqEbikeSysRbacksetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRbacksetDto();
EbikeSysRbackset ebikeSysRbackset = new EbikeSysRbackset(); EbikeSysRbackset ebikeSysRbackset = new EbikeSysRbackset();
BeanUtils.copyProperties(reqEbikeSysRbacksetDto, 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); ebikeSysRbacksetMapper.update(ebikeSysRbackset);
//客服配置 //客服配置
query.clear(); query.clear();
@ -268,6 +280,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
EbikeSysRbackset ebikeSysRbackset = ebikeSysRbacksetMapper.selectOneByQuery(query); EbikeSysRbackset ebikeSysRbackset = ebikeSysRbacksetMapper.selectOneByQuery(query);
ResEbikeSysRbacksetDto resEbikeSysRbacksetDto = new ResEbikeSysRbacksetDto(); ResEbikeSysRbacksetDto resEbikeSysRbacksetDto = new ResEbikeSysRbacksetDto();
BeanUtils.copyProperties(ebikeSysRbackset, 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); resEbikeSysRoperatesetsDto.setEbikeSysRbacksetDto(resEbikeSysRbacksetDto);
//客服配置 //客服配置
query.clear(); query.clear();