xp-robotaxi-account-boot/src/main/resources/bootstrap.yml
@@ -29,6 +29,7 @@ namespace: 88de3938-82f9-4cab-97cf-6173202703e0 username: nacos password: nacos ip: 192.168.110.85 config: # 配置中心地址 server-addr: 192.168.110.80:8848 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java
@@ -16,10 +16,7 @@ import com.xiaopeng.common.core.utils.bean.BeanUtils; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.operation.constant.I18nKeyConstant; import com.xiaopeng.operation.service.IXpElectronicFenceAreaService; import com.xiaopeng.operation.service.IXpElectronicFenceService; import com.xiaopeng.operation.service.IXpPointService; import com.xiaopeng.operation.service.XpRegionService; import com.xiaopeng.operation.service.*; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType; @@ -59,7 +56,7 @@ private XpRegionService regionService; @Resource private IXpPointService xpPointService; private XpPointService xpPointService; @Resource private XpStationClient stationClient; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/job/base/AbstractJob.java
@@ -3,10 +3,7 @@ import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient; import com.xiaopeng.common.redis.service.RedisService; import com.xiaopeng.operation.job.utils.SpringContextsUtil; import com.xiaopeng.operation.service.IXpElectronicFenceAreaService; import com.xiaopeng.operation.service.IXpElectronicFenceService; import com.xiaopeng.operation.service.IXpPointService; import com.xiaopeng.operation.service.XpSystemSettingService; import com.xiaopeng.operation.service.*; import org.quartz.Job; import org.quartz.JobDataMap; import org.quartz.JobExecutionContext; @@ -22,7 +19,7 @@ protected IXpElectronicFenceService xpElectronicFenceService; protected IXpElectronicFenceAreaService xpElectronicFenceAreaService; protected IXpPointService xpPointService; protected XpPointService xpPointService; protected XpPushMessageClient xpPushMessageClient; protected XpSystemSettingService xpSystemSettingService; protected RedisService redisService; @@ -30,7 +27,7 @@ public AbstractJob(){ this.xpElectronicFenceService = SpringContextsUtil.getBean(IXpElectronicFenceService.class); this.xpElectronicFenceAreaService = SpringContextsUtil.getBean(IXpElectronicFenceAreaService.class); this.xpPointService = SpringContextsUtil.getBean(IXpPointService.class); this.xpPointService = SpringContextsUtil.getBean(XpPointService.class); this.xpPushMessageClient = SpringContextsUtil.getBean(XpPushMessageClient.class); this.xpSystemSettingService = SpringContextsUtil.getBean(XpSystemSettingService.class); this.redisService = SpringContextsUtil.getBean(RedisService.class); xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/IXpPointService.java
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -204,17 +204,17 @@ List<NearestNextVo> objects = new ArrayList<NearestNextVo>(); if (!nearestNextVos.isEmpty()) { //收藏的数据 List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList()); collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1); List<NearestNextVo> collect = nearestNextVos.stream().filter(s -> s.getIsCollect() == 1) .sorted(Comparator.comparing(NearestNextVo::getDistance)).collect(Collectors.toList()); objects.addAll(collect); //非收藏的数据 List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList()); collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1); List<NearestNextVo> collect1 = nearestNextVos.stream().filter(s -> s.getIsCollect() == 2) .sorted(Comparator.comparing(NearestNextVo::getDistance)).collect(Collectors.toList()); objects.addAll(collect1); } nearestVo.setPoints(nearestNextVos); nearestVo.setTotal(nearestNextVos.size()); nearestVo.setPoints(objects); nearestVo.setTotal(objects.size()); return nearestVo; } xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1676,12 +1676,12 @@ List<XpHistoryStartPointsVo> objects = new ArrayList<XpHistoryStartPointsVo>(); if(!data.isEmpty()){ //收藏的数据 List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList()); collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1); List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1) .sorted(Comparator.comparing(XpHistoryStartPointsVo::getDistance)).collect(Collectors.toList()); objects.addAll(collect); //非收藏的数据 List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList()); collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1); List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2) .sorted(Comparator.comparing(XpHistoryStartPointsVo::getDistance)).collect(Collectors.toList()); objects.addAll(collect1); } return objects; @@ -1715,12 +1715,12 @@ List<XpHistoryEndPointsVo> objects = new ArrayList<XpHistoryEndPointsVo>(); if(!data.isEmpty()){ //收藏的数据 List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList()); collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1); List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1) .sorted(Comparator.comparing(XpHistoryEndPointsVo::getDistance)).collect(Collectors.toList()); objects.addAll(collect); //非收藏的数据 List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList()); collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1); List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2) .sorted(Comparator.comparing(XpHistoryEndPointsVo::getDistance)).collect(Collectors.toList()); objects.addAll(collect1); } return objects;
