xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpCoupon.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonFormat; import com.xiaopeng.common.core.web.domain.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -32,6 +33,7 @@ private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.ASSIGN_ID) @JsonFormat(shape = JsonFormat.Shape.STRING) private Long id; @ApiModelProperty(value = "优惠券") xp-robotaxi-api/src/main/java/com/xiaopeng/api/query/maintenance/VehicleCleanQuery.java
New file @@ -0,0 +1,13 @@ package com.xiaopeng.api.query.maintenance; import com.xiaopeng.common.core.web.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "车辆清洁查询参数") public class VehicleCleanQuery extends BasePage { @ApiModelProperty(value = "车辆ID") private Long vehicleId; } xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryEndPointsVo.java
@@ -31,7 +31,7 @@ @ApiModelProperty("operation_status 运营状态 1=展示 2置灰") private Integer operationStatus=2; private Integer operationStatus=1; private Long electronicAreaId;
@@ -31,7 +31,7 @@ @ApiModelProperty("operation_status 运营状态 1=展示 2置灰") private Integer operationStatus=2; private Integer operationStatus=1; private Long electronicAreaId;
@@ -1,9 +1,14 @@ package com.xiaopeng.maintenance.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.xiaopeng.api.feignClient.account.XpOperationUserClient; import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient; import com.xiaopeng.api.model.maintenance.XpVehicleClean; import com.xiaopeng.api.query.maintenance.VehicleCleanQuery; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.domain.BaseModel; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.common.security.service.TokenService; import com.xiaopeng.maintenance.dto.XpVehicleCleanDTO; import com.xiaopeng.maintenance.model.vo.XpVehicleCleanVO; @@ -71,5 +76,29 @@ return R.ok(xpVehicleCleanVO); } /** * 车辆清洁列表 */ @ApiOperation(value = "车辆管理-清洁列表", tags = {"管理后台-车辆管理"}) @PostMapping("/api/v1/vehicleClean/list") public R<PageInfo<XpVehicleClean>> list(@RequestBody VehicleCleanQuery query) { PageInfo<XpVehicleClean> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); PageInfo<XpVehicleClean> page = xpVehicleCleanService.page(pageInfo, new LambdaQueryWrapper<XpVehicleClean>().eq(XpVehicleClean::getVehicleId, query.getVehicleId()).orderByDesc(BaseModel::getCreateTime)); return R.ok(page); } /** * 删除数据 */ @ApiOperation(value = "车辆管理-删除数据", tags = {"管理后台-车辆管理"}) @DeleteMapping("/api/v1/vehicleClean/delete") public R<String> delete(@RequestParam Long id) { xpVehicleCleanService.removeById(id); return R.ok(); } }
@@ -90,7 +90,7 @@ } }else if(dto.getDepartureStatus()==3){ // 收车 关闭当前巡游单子 生成新的返程单子 找到收车站点 xpCruiseOrderClient.cancelCruiseOrderByVin(xpVehicle.getVehicleVin()); R<Long> r = xpCruiseOrderClient.cancelCruiseOrderByVin(xpVehicle.getVehicleVin()); XpCruiseOrder xpCruiseOrder = new XpCruiseOrder(); if(vehiclePosition!=null){ xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCouponController.java
@@ -64,4 +64,25 @@ return R.ok(); } /** * 优惠券详情 */ @GetMapping("/v1/api/xp-coupon/queryById") @ApiOperation(value = "优惠券详情",tags = {"管理后台-优惠券"},response = XpCoupon.class) public R<XpCoupon> queryById(@RequestParam Long id){ XpCoupon xpCoupon = xpCouponService.getById(id); return R.ok(xpCoupon); } /** * 删除优惠券 */ @DeleteMapping("/v1/api/xp-coupon/deleteById") @ApiOperation(value = "删除优惠券",tags = {"管理后台-优惠券"},response = XpCoupon.class) public R<?> deleteById(@RequestParam Long id){ xpCouponService.removeById(id); return R.ok(); } } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -277,13 +277,13 @@ XpHistoryStartPointsVo xpHistoryStartPointsVo = new XpHistoryStartPointsVo(); xpHistoryStartPointsVo.setOperationStatus(xpPoint.getOperationStatus()); xpHistoryStartPointsVo.setOperationStatus(1); xpHistoryStartPointsVo.setName(xpPoint.getPointName()); xpHistoryStartPointsVo.setAddress(xpPoint.getPointAddress()); xpHistoryStartPointsVo.setLatitude(xpPoint.getPointLat()); xpHistoryStartPointsVo.setLongitude(xpPoint.getPointLon()); xpHistoryStartPointsVo.setId(xpPoint.getId()); double distanced = FastDistanceCalculator.distanceFastKm(historyStartPointsDto.getLat(), historyStartPointsDto.getLon(), xpPoint.getPointLat(), xpPoint.getPointLon()); double distanced = FastDistanceCalculator.distanceFast(historyStartPointsDto.getLat(), historyStartPointsDto.getLon(), xpPoint.getPointLat(), xpPoint.getPointLon()); xpHistoryStartPointsVo.setDistance(distanced); xpHistoryStartPointsVo.setTime(xpPoint.getParkingTimeLimit()); xpHistoryStartPointsVo.setElectronicAreaId(xpPoint.getElectronicAreaId()); @@ -350,13 +350,13 @@ } } XpHistoryEndPointsVo xpHistoryEndPointsVo = new XpHistoryEndPointsVo(); xpHistoryEndPointsVo.setOperationStatus(xpPoint.getOperationStatus()); xpHistoryEndPointsVo.setOperationStatus(1); xpHistoryEndPointsVo.setName(xpPoint.getPointName()); xpHistoryEndPointsVo.setAddress(xpPoint.getPointAddress()); xpHistoryEndPointsVo.setLatitude(xpPoint.getPointLat()); xpHistoryEndPointsVo.setLongitude(xpPoint.getPointLon()); xpHistoryEndPointsVo.setId(xpPoint.getId()); double distanced = FastDistanceCalculator.distanceFastKm(historyEndPointsDto.getLat(), historyEndPointsDto.getLon(), xpPoint.getPointLat(), xpPoint.getPointLon()); double distanced = FastDistanceCalculator.distanceFast(historyEndPointsDto.getLat(), historyEndPointsDto.getLon(), xpPoint.getPointLat(), xpPoint.getPointLon()); xpHistoryEndPointsVo.setDistance(distanced); xpHistoryEndPointsVo.setTime(xpPoint.getParkingTimeLimit()); xpHistoryEndPointsVo.setElectronicAreaId(xpPoint.getElectronicAreaId());
