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-06 18:01:02 +08:00
parent 78507c428e
commit 700803fd20
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java
View File

@ -37,6 +37,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.data.geo.Point; import org.springframework.data.geo.Point;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
@ -93,8 +94,8 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
@Override @Override
public Page<EbikeOperationRegion> pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) { public Page<EbikeOperationRegion> pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_OPERATION_REGION.SIMPLE_NAME.eq(simpleName, !simpleName.isBlank())) .where(EBIKE_OPERATION_REGION.SIMPLE_NAME.eq(simpleName, !StringUtils.isEmpty(simpleName)))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_NAME.eq(regionName, !regionName.isBlank())) .where(EBIKE_OPERATION_REGION.OPERATION_REGION_NAME.eq(regionName, !StringUtils.isEmpty(regionName)))
.where(EBIKE_OPERATION_REGION.IN_OPERATION.eq(inOperation, Objects::nonNull)); .where(EBIKE_OPERATION_REGION.IN_OPERATION.eq(inOperation, Objects::nonNull));
return this.mapper.paginate(pageParam.getPage(), queryWrapper); return this.mapper.paginate(pageParam.getPage(), queryWrapper);
} }
@ -122,8 +123,8 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
@Override @Override
public void delOperation(ReqBatchRegionDto delRegionDto) { public void delOperation(ReqBatchRegionDto delRegionDto) {
List<EbikeOperationRegion> ebikeOperationRegions = this.mapper.selectListByIds(delRegionDto.getIds()); List<EbikeOperationRegion> ebikeOperationRegions = this.mapper.selectListByIds(delRegionDto.getIds());
ebikeOperationRegions.forEach(region->{ ebikeOperationRegions.forEach(region -> {
delPoints(region.getOrgId(),region.getOperationRegionId()); delPoints(region.getOrgId(), region.getOperationRegionId());
}); });
this.mapper.deleteBatchByIds(delRegionDto.getIds()); this.mapper.deleteBatchByIds(delRegionDto.getIds());
} }
@ -135,7 +136,7 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
.leftJoin(EBIKE_STAFF_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_STAFF_REGION.REGION_ID)) .leftJoin(EBIKE_STAFF_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_STAFF_REGION.REGION_ID))
.where(EBIKE_STAFF_REGION.STAFF_ID.eq(staffFeign.getStaffId())) .where(EBIKE_STAFF_REGION.STAFF_ID.eq(staffFeign.getStaffId()))
.where(EBIKE_OPERATION_REGION.ZONE_ID.eq(zoneId, StringUtil.hasText(zoneId))); .where(EBIKE_OPERATION_REGION.ZONE_ID.eq(zoneId, StringUtil.hasText(zoneId)));
return this.mapper.selectListWithRelationsByQueryAs(queryWrapper,ResEbikeOperationRegionDto.class); return this.mapper.selectListWithRelationsByQueryAs(queryWrapper, ResEbikeOperationRegionDto.class);
} }
@Override @Override
@ -178,14 +179,14 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
if (redisPoints == null || redisPoints.isEmpty()) { if (redisPoints == null || redisPoints.isEmpty()) {
return List.of(); return List.of();
} }
Map<String,RedisPoint> map = new HashMap<>(); Map<String, RedisPoint> map = new HashMap<>();
for (RedisPoint redisPoint : redisPoints) { for (RedisPoint redisPoint : redisPoints) {
map.put(redisPoint.getMember(), redisPoint); map.put(redisPoint.getMember(), redisPoint);
} }
List<String> strings = redisPoints.stream().map(RedisPoint::getMember).toList(); List<String> strings = redisPoints.stream().map(RedisPoint::getMember).toList();
ReqEcuSnDto ecuSnDto = new ReqEcuSnDto(strings); ReqEcuSnDto ecuSnDto = new ReqEcuSnDto(strings);
JsonResult<List<RspBikeInfo>> result = maintenanceFeignClient.getBikeByEcuSn(ecuSnDto); JsonResult<List<RspBikeInfo>> result = maintenanceFeignClient.getBikeByEcuSn(ecuSnDto);
if (result.getCode() != 200){ if (result.getCode() != 200) {
throw new RuntimeException("获取车辆信息失败"); throw new RuntimeException("获取车辆信息失败");
} }
List<RspBikeInfo> bikeInfos = result.getData(); List<RspBikeInfo> bikeInfos = result.getData();
@ -211,7 +212,7 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
.select(EBIKE_OPERATION_REGION.OPERATION_REGION_ID) .select(EBIKE_OPERATION_REGION.OPERATION_REGION_ID)
.leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID)) .leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID))
.where(EBIKE_ADMINISTRATION_ZONE.NAME.like(zoneName)); .where(EBIKE_ADMINISTRATION_ZONE.NAME.like(zoneName));
return this.mapper.selectListByQueryAs(queryWrapper,Long.class); return this.mapper.selectListByQueryAs(queryWrapper, Long.class);
} }
void savePoints(List<ReqEbikePointDto> points, Long orgId, Long operateRegionId) { void savePoints(List<ReqEbikePointDto> points, Long orgId, Long operateRegionId) {
@ -262,7 +263,7 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
redisUtil.delOperationArea(orgId, operateRegionId); redisUtil.delOperationArea(orgId, operateRegionId);
} }
StaffFeign getStaff(){ StaffFeign getStaff() {
String tokenValue = StpUtil.getTokenValue(); String tokenValue = StpUtil.getTokenValue();
JsonResult<StaffFeign> jsonResult = staffFeignClient.getInfoByToken(tokenValue); JsonResult<StaffFeign> jsonResult = staffFeignClient.getInfoByToken(tokenValue);
StaffFeign staffFeign = jsonResult.getData(); StaffFeign staffFeign = jsonResult.getData();