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-05-07 15:07:37 +08:00
parent 75ee58b11a
commit 543efcb87a
12 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeSysRoperatesetController.java
View File

@ -45,10 +45,10 @@ public class EbikeSysRoperatesetController {
}
@RequestMapping("getRegionConfigById")
public JsonResult<?> getRegionConfigById(@RequestParam(value = "regionId")
String regionId) {
public JsonResult<?> getRegionConfigById(@RequestParam(value = "operationRegionId")
String operationRegionId) {
ResEbikeSysRoperatesetsDto resEbikeSysRoperatesetsDto =
ebikeSysRoperatesetService.getRegionConfigById(regionId);
ebikeSysRoperatesetService.getRegionConfigById(operationRegionId);
return resEbikeSysRoperatesetsDto == null ? JsonResult.failed("") :
JsonResult.success(resEbikeSysRoperatesetsDto);
}

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

@ -18,6 +18,7 @@ import java.time.LocalTime;
@NoArgsConstructor
@AllArgsConstructor
public class ReqEbikeSysOperateSetSaveDto {
/**
* 区域ID
*/

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

@ -22,6 +22,7 @@ import java.math.BigDecimal;
public class ReqEbikeSysRbacksetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -13,6 +13,8 @@ import java.io.Serializable;
@Data
public class ReqEbikeSysRlocksetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -20,6 +20,7 @@ import java.util.List;
@Data
public class ReqEbikeSysRoperatesetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -14,6 +14,8 @@ import java.math.BigDecimal;
@Data
public class ReqEbikeSysRusecondsetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -16,6 +16,7 @@ import java.math.BigDecimal;
public class ResEbikeSysRbacksetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -13,6 +13,7 @@ import java.io.Serializable;
@Data
public class ResEbikeSysRlocksetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -21,6 +21,7 @@ import java.util.List;
@Data
public class ResEbikeSysRoperatesetDto implements Serializable {
private String id;
/**
* 区域ID
*/

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

@ -14,6 +14,7 @@ import java.math.BigDecimal;
@Data
public class ResEbikeSysRusecondsetDto implements Serializable {
private String id;
/**
* 区域ID
*/

4
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSysRoperatesetService.java
View File

@ -47,8 +47,8 @@ public interface EbikeSysRoperatesetService extends IService<EbikeSysRoperateset
/**
* 根据区域id获取区域配置信息
*
* @param regionId
* @param operationRegionId
* @return
*/
ResEbikeSysRoperatesetsDto getRegionConfigById(String regionId);
ResEbikeSysRoperatesetsDto getRegionConfigById(String operationRegionId);
}

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

@ -143,6 +143,7 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
}
@Override
@Transactional
public Boolean updateById(ReqEbikeSysRoperatesetsDto reqEbikeSysRoperatesetsDto) {
try {
ReqEbikeSysRoperatesetDto reqEbikeSysRoperatesetDto = reqEbikeSysRoperatesetsDto.getEbikeSysRoperatesetDto();
@ -150,7 +151,12 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
//运营配置/开关配置
EbikeSysRoperateset ebikeSysRoperateset = new EbikeSysRoperateset();
BeanUtils.copyProperties(reqEbikeSysRoperatesetDto, ebikeSysRoperateset);
ebikeSysRoperateset.setRechargeRule(reqEbikeSysRoperatesetDto.getRechargeRule().toString());
if (!StringUtils.isEmpty(reqEbikeSysRoperatesetDto.getRechargeRule())) {
ebikeSysRoperateset.setRechargeRule(reqEbikeSysRoperatesetDto.getRechargeRule().toString());
}
if (!StringUtils.isEmpty(reqEbikeSysRoperatesetDto.getChannel())) {
ebikeSysRoperateset.setChannel(reqEbikeSysRoperatesetDto.getChannel().toString());
}
ebikeSysRoperatesetMapper.update(ebikeSysRoperateset);
//运营时间
QueryWrapper query = QueryWrapper.create();
@ -206,18 +212,18 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
}
@Override
public ResEbikeSysRoperatesetsDto getRegionConfigById(String regionId) {
public ResEbikeSysRoperatesetsDto getRegionConfigById(String operationRegionId) {
ResEbikeSysRoperatesetsDto resEbikeSysRoperatesetsDto = new ResEbikeSysRoperatesetsDto();
ResEbikeSysRoperatesetDto resEbikeSysRoperatesetDto = new ResEbikeSysRoperatesetDto();
try {
//运营配置/开关配置
QueryWrapper query = QueryWrapper.create();
query.eq(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.getName(), regionId);
query.eq(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.getName(), operationRegionId);
EbikeSysRoperateset ebikeSysRoperateset =
ebikeSysRoperatesetMapper.selectOneByQuery(query);
BeanUtils.copyProperties(ebikeSysRoperateset, resEbikeSysRoperatesetDto);
query.clear();
query.eq(EBIKE_SYS_OPERATE_SET.OPERATION_REGION_ID.getName(), regionId);
query.eq(EBIKE_SYS_OPERATE_SET.OPERATION_REGION_ID.getName(), operationRegionId);
List<EbikeSysOperateSet> ebikeSysOperateSets =
ebikeSysOperateSetMapper.selectListByQuery(query);
String operateType = ebikeSysRoperateset.getOperateType();
@ -244,28 +250,28 @@ public class EbikeSysRoperatesetServiceImpl extends ServiceImpl<EbikeSysRoperate
resEbikeSysRoperatesetsDto.setEbikeSysRoperatesetDto(resEbikeSysRoperatesetDto);
//用车配置
query.clear();
query.eq(EBIKE_SYS_RUSECONDSET.OPERATION_REGION_ID.getName(), regionId);
query.eq(EBIKE_SYS_RUSECONDSET.OPERATION_REGION_ID.getName(), operationRegionId);
EbikeSysRusecondset ebikeSysRusecondset = ebikeSysRusecondsetMapper.selectOneByQuery(query);
ResEbikeSysRusecondsetDto resEbikeSysRusecondsetDto = new ResEbikeSysRusecondsetDto();
BeanUtils.copyProperties(ebikeSysRusecondset, resEbikeSysRusecondsetDto);
resEbikeSysRoperatesetsDto.setEbikeSysRusecondsetDto(resEbikeSysRusecondsetDto);
//锁车配置
query.clear();
query.eq(EBIKE_SYS_RLOCKSET.OPERATION_REGION_ID.getName(), regionId);
query.eq(EBIKE_SYS_RLOCKSET.OPERATION_REGION_ID.getName(), operationRegionId);
EbikeSysRlockset ebikeSysRlockset = ebikeSysRlocksetMapper.selectOneByQuery(query);
ResEbikeSysRlocksetDto resEbikeSysRlocksetDto = new ResEbikeSysRlocksetDto();
BeanUtils.copyProperties(ebikeSysRlockset, resEbikeSysRlocksetDto);
resEbikeSysRoperatesetsDto.setEbikeSysRlocksetDto(resEbikeSysRlocksetDto);
//还车配置
query.clear();
query.eq(EBIKE_SYS_RBACKSET.OPERATION_REGION_ID.getName(), regionId);
query.eq(EBIKE_SYS_RBACKSET.OPERATION_REGION_ID.getName(), operationRegionId);
EbikeSysRbackset ebikeSysRbackset = ebikeSysRbacksetMapper.selectOneByQuery(query);
ResEbikeSysRbacksetDto resEbikeSysRbacksetDto = new ResEbikeSysRbacksetDto();
BeanUtils.copyProperties(ebikeSysRbackset, resEbikeSysRbacksetDto);
resEbikeSysRoperatesetsDto.setEbikeSysRbacksetDto(resEbikeSysRbacksetDto);
//客服配置
query.clear();
query.eq(EBIKE_SYS_LINKTEL.OPERATION_REGION_ID.getName(), regionId);
query.eq(EBIKE_SYS_LINKTEL.OPERATION_REGION_ID.getName(), operationRegionId);
List<EbikeSysLinktel> ebikeSysLinktels = ebikeSysLinktelMapper.selectListByQuery(query);
List<ResEbikeSysLinktelDto> resEbikeSysLinktelDtos = new ArrayList<>();
for (EbikeSysLinktel ebikeSysLinktel : ebikeSysLinktels) {