xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/ReassignOrderDTO.java
@@ -21,15 +21,4 @@ @ApiModelProperty(value = "订单号") private String orderNo; @ApiModelProperty(value = "订单id") private Long orderId; @ApiModelProperty(value = "车辆id") private Long vehicleId; @ApiModelProperty(value = "车队id") private Long fleetId; } xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpReassignOrderClientFallbackFactory.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpReassignOrderClient.java
File was deleted xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -126,7 +126,6 @@ xpTaskService.saveVehicleAccident(dto, xpOperationsUser); return R.ok(); } @ApiOperation(value = "车辆事故任务详情", tags = "运维APP-任务中心") @GetMapping("/api/v1/task/vehicleAccidentDetail") public R<TaskAccidentDetailVO> vehicleAccidentDetail(Long id) { xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/exportExcel/XpTaskExportExcel.java
@@ -25,7 +25,7 @@ @Excel(name = "车牌号",width = 20) private String plateNumber; @ApiModelProperty(value = "任务类别1常规 2事故") @Excel(name = "任务类别",width = 20,replace = {"常规_1","事故_2"}) @Excel(name = "任务类别",width = 20) private Integer taskCategory; @ApiModelProperty(value = "类型") @Excel(name = "类型",width = 40) xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/model/vo/TaskManagementPreparationDetailVO.java
@@ -69,8 +69,6 @@ @ApiModelProperty(value = "遗失物品") private String lostItems; @ApiModelProperty(value = "遗失物品说明") private String lostItemsDetail; @ApiModelProperty(value = "备注") private String remarks; xp-robotaxi-map-boot/pom.xml
@@ -15,11 +15,7 @@ </description> <dependencies> <dependency> <groupId>com.belerweb</groupId> <artifactId>pinyin4j</artifactId> <version>2.5.1</version> </dependency> <!-- easypoi --> <!-- Apache POI 核心依赖 --> <dependency> xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/config/DataUpdateHandlerConfig.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/config/MybatisPlusConfig.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
@@ -1,7 +1,6 @@ package com.xiaopeng.map.controller; import cn.hutool.core.collection.CollUtil; import com.xiaopeng.api.dto.operation.ElectronicFenceAddDto; import com.xiaopeng.api.dto.operation.ElectronicFenceAreaUpdateStatusDto; import com.xiaopeng.api.dto.operation.ElectronicFenceUpdateDto; @@ -9,7 +8,6 @@ import com.xiaopeng.api.model.operation.XpElectronicFence; import com.xiaopeng.api.model.operation.XpElectronicFenceArea; import com.xiaopeng.api.model.operation.XpPoint; import com.xiaopeng.api.model.operation.XpRegion; import com.xiaopeng.api.query.operation.ElectronicPageListQuery; import com.xiaopeng.api.vo.operation.ElectronicFenceDetailVo; import com.xiaopeng.common.core.domain.R; @@ -17,10 +15,6 @@ import com.xiaopeng.common.core.utils.bean.BeanUtils; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.common.security.service.TokenService; import com.xiaopeng.map.constant.I18nKeyConstant; import com.xiaopeng.map.service.XpElectronicFenceAreaService; import com.xiaopeng.map.service.XpElectronicFenceService; import com.xiaopeng.map.service.XpRegionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -31,8 +25,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Collection; import java.util.Collections; import java.util.List; /** @@ -51,38 +43,17 @@ @Resource private XpElectronicFenceService xpElectronicFenceService; private TokenService tokenService; @Resource private XpElectronicFenceAreaService xpElectronicFenceAreaService; private XpElectronicClient xpElectronicClient; @Resource private XpRegionService regionService; /** * 查询省市管理 */ @ApiOperation(value = "查询省市区",response = XpRegion.class) @GetMapping(value = "/getRegion") public R<List<List<XpRegion>>> geXpRegion() { return R.ok(regionService.getXpRegion()); } @ApiOperation(value = "电子围栏管理列表", response = XpElectronicFence.class) @ApiOperation(value = "电子围栏管理列表", response = XpPoint.class) @PostMapping("/pageList") public R<PageInfo<XpElectronicFence>> pageList(@RequestBody ElectronicPageListQuery query) { PageInfo<XpElectronicFence> pageList = xpElectronicFenceService.pageList(query); return R.ok(pageList); return R.ok(xpElectronicClient.pageList(query).getData()); } /** * 电子围栏列表接口 * * @return 电子围栏列表 */ @ApiOperation(value = "电子围栏列表接口", tags = {"运维APP-车辆管理"}) @GetMapping("/api/v1/electronicFence/list") public R<List<XpElectronicFence>> vehicleMap() { List<XpElectronicFence> list = xpElectronicFenceService.list(); return R.ok(list); } /** * 新增电子围栏 */ @@ -91,7 +62,8 @@ // @Transactional // @ShardingSphereTransactionType(TransactionType.BASE) public R add(@Validated @RequestBody ElectronicFenceAddDto dto) { return xpElectronicFenceService.addElectronic(dto); return xpElectronicClient.add(dto); } @@ -105,47 +77,30 @@ // @Transactional // @ShardingSphereTransactionType(TransactionType.BASE) public R updateStatus(@RequestBody ElectronicFenceAreaUpdateStatusDto dto) { XpElectronicFenceArea electronicFenceArea = xpElectronicFenceAreaService.getById(dto.getId()); if (electronicFenceArea == null) { throw new ServiceException( "围栏构成不存在,请刷新重试", I18nKeyConstant.FENCE_STRUCTURE_NOT_EXIST ); } xpElectronicFenceAreaService.updateById(electronicFenceArea); return R.ok(); return xpElectronicClient.updateStatus(dto); } /** * 电子围栏详情 */ @PostMapping("/queryById") @ResponseBody @ApiOperation(value = "电子围栏详情") public R<ElectronicFenceDetailVo> queryById(@RequestParam("id")Long id) { ElectronicFenceDetailVo res = new ElectronicFenceDetailVo(); XpElectronicFence electronicFence = xpElectronicFenceService.getById(id); if (electronicFence == null) { throw new ServiceException( "电子围栏不存在,请刷新重试", I18nKeyConstant.FENCE_NOT_EXIST ); } BeanUtils.copyProperties(electronicFence, res); List<XpElectronicFenceArea> electronicFenceAreaList = xpElectronicFenceAreaService.lambdaQuery().eq(XpElectronicFenceArea::getElectronicId, id) .list(); res.setElectronicFenceAreas(electronicFenceAreaList); return R.ok(res); return xpElectronicClient.queryById(id); } /** * 编辑电子围栏 */ @PostMapping("/edit") @ResponseBody @ApiOperation(value = "编辑电子围栏") // @Transactional // @ShardingSphereTransactionType(TransactionType.BASE) public R edit(@Validated @RequestBody ElectronicFenceUpdateDto dto) { return xpElectronicFenceService.editElectronic(dto); return xpElectronicClient.edit(dto); } /** @@ -156,77 +111,6 @@ // @Transactional // @ShardingSphereTransactionType(TransactionType.BASE) public R<Long> copy(@RequestParam("id") Integer id) { XpElectronicFence electronicFence = xpElectronicFenceService.getById(id); if (electronicFence.getStatus()==2){ throw new ServiceException( "当前电子围栏状态为启用中，不可复制", I18nKeyConstant.FENCE_STATUS_CANNOT_COPIED ); } electronicFence.setElectronicName("副本_"+electronicFence.getElectronicName()); electronicFence.setId(null); electronicFence.setStatus(0); xpElectronicFenceService.save(electronicFence); List<XpElectronicFenceArea> electronicFenceAreaList = xpElectronicFenceAreaService.lambdaQuery().eq(XpElectronicFenceArea::getElectronicId, id) .list(); for (XpElectronicFenceArea area : electronicFenceAreaList) { area.setId(null); area.setElectronicId(electronicFence.getId()); area.setAreaStatus(2); area.setAreaName("副本_"+area.getAreaName()); } xpElectronicFenceAreaService.saveBatch(electronicFenceAreaList); return R.ok(electronicFence.getId()); } /** * 根据ID列表批量查询电子围栏 * * @param electronicIdSet * @return */ @PostMapping("/listByIds") R<List<XpElectronicFence>> listByIds(@RequestBody Collection<Long> electronicIdSet) { if (CollUtil.isEmpty(electronicIdSet)) { return R.ok(Collections.emptyList()); } return R.ok(xpElectronicFenceService.listByIds(electronicIdSet)); } @ApiOperation(value = "获取已启用的电子围栏列表",tags = {"管理后台-在库车辆管理"}) @GetMapping("/available/list") R<List<XpElectronicFence>> getAvailableList(){ return R.ok(xpElectronicFenceService.getAvailableList()); } @ApiOperation(value = "获取不分页的电子围栏列表",tags = {"管理后台-在库车辆管理"}) @GetMapping("/list") R<List<XpElectronicFence>> getList(){ return R.ok(xpElectronicFenceService.getList()); } /** * 批量查询电子围栏 * @param fenceIds * @return */ @PostMapping("/inner/xpElectronicFence/selectBatchIds") public R<List<XpElectronicFence>> selectBatchIds(@RequestBody List<String> fenceIds){ List<XpElectronicFence> xpElectronicFences = xpElectronicFenceService.listByIds(fenceIds); return R.ok(xpElectronicFences); } /** * 根据ID查询电子围栏 * @param fenceId * @return */ @GetMapping("/inner/xpElectronicFence/selectById") public R<XpElectronicFence> selectById(@RequestParam String fenceId){ XpElectronicFence xpElectronicFence = xpElectronicFenceService.getById(fenceId); return R.ok(xpElectronicFence); return xpElectronicClient.copy(id); } } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/NearestDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/NotificationDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/OpenCityAddDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/OpenCityEditDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/PricingAddDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/PricingEditDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/PricingSetPriceDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/PricingSetRuleDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/RoutePlanAddDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/RoutePlanEditDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/WhitelistAddDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/WhitelistEditDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpAgreementAppUserDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpAgreementDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpCruisePlanAddDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpCruisePlanEditDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpFrequentlyAskedQuestionsDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpOrderDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpPointSpecialDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpRideGuideDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpTradingStrategyEditDTO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/dto/XpUserFeedbackDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/base/AbstractJob.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/base/QuartzManager.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/base/TimeJobType.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/exceptions/TimeException.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/jobs/ElectronicEffectJob.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/jobs/OrderCancelJob.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/job/utils/SpringContextsUtil.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/mapper/XpElectronicFenceMapper.java
@@ -3,11 +3,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xiaopeng.api.model.operation.XpElectronicFence; import com.xiaopeng.api.query.operation.ElectronicPageListQuery; import com.xiaopeng.common.core.web.page.PageInfo; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -18,6 +13,5 @@ * @since 2026-02-03 */ public interface XpElectronicFenceMapper extends BaseMapper<XpElectronicFence> { List<XpElectronicFence> pageList(@Param("pageInfo") PageInfo<XpElectronicFence> pageInfo, @Param("query") ElectronicPageListQuery query); } xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/mapper/XpOpenCityMapper.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/mapper/XpRegionMapper.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/mapper/XpSystemSettingMapper.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/BannerPageListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/CruisePlanQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/InvitationPageListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/OpenCityPageQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/PointByNameQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/PricingPageListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/RoutePlanPageListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/UserFeedBackQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/WhitelistLogPageListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/WhitelistPageListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/XpCouponListQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/query/getProvinceQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpElectronicFenceService.java
@@ -2,14 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.xiaopeng.api.dto.operation.ElectronicFenceAddDto; import com.xiaopeng.api.dto.operation.ElectronicFenceUpdateDto; import com.xiaopeng.api.model.operation.XpElectronicFence; import com.xiaopeng.api.query.operation.ElectronicPageListQuery; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.web.page.PageInfo; import java.util.List; /** * <p> @@ -20,23 +13,7 @@ * @since 2026-02-03 */ public interface XpElectronicFenceService extends IService<XpElectronicFence> { PageInfo<XpElectronicFence> pageList(ElectronicPageListQuery query); R addElectronic(ElectronicFenceAddDto dto); R editElectronic(ElectronicFenceUpdateDto dto); /** * 查询启用的电子围栏列表 * @return */ List<XpElectronicFence> getAvailableList(); /** * 获取不分页的围栏列表 * @return */ List<XpElectronicFence> getList(); }
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpRegionService.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/XpSystemSettingService.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpRegionServiceImpl.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpSystemSettingServiceImpl.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/PolygonOverlapService.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/TimeRangeChecker.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/map/map/FastDistanceCalculator.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/utils/map/map/GeodesyUtil.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/CustomerServicePhoneVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/FileUploadVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/IndexDto.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/MetaVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/NearestNextVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/NearestVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/OpenCityListVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/OrderDistanceVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/PricingPageListVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/RegionCascaderVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/RegionDistrictSyncResultVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/RouterVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/SaveOrderVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/SpecialPointListVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/SpecialPointVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/SysOperLogQuery.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/TCompanyToUserVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/UserRoleVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/ViolationListExportVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpAgreementVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpAppVersionVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpBannerListVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpCruisePlanDetailVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpCruisePlanPointVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpCruisePlanVehicleVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpOpenCityNextVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpOpenCityVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpPricingCardVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpRideGuideNextVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpRideGuideVo.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpTradingStrategyDetailVO.java
File was deleted xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/vo/XpUserFeedbackVO.java
File was deleted xp-robotaxi-map-boot/src/main/resources/mapper/XpElectronicFenceMapper.xml
@@ -24,78 +24,5 @@ <sql id="Base_Column_List"> id, electronic_name, electronic_number, status, effect_type, effect_time, failure_type, failure_time, operation_strategy, is_deleted, create_time, update_time, create_by, update_by </sql> <select id="pageList" resultType="com.xiaopeng.api.model.operation.XpElectronicFence"> select ef.id, ef.electronic_name as electronicName, ef.electronic_number as electronicNumber, ef.status, ef.effect_type as effectType, ef.effect_time as effectTime, ef.failure_type as failureType, ef.failure_time as failureTime, ef.operation_strategy as operationStrategy , ef.create_time as createTime, ef.update_time as updateTime, ef.create_by as createBy, ef.update_by as updateBy from xp_electronic_fence ef left join xp_electronic_fence_area efa on efa.electronic_id = ef.id where ef.is_deleted = 0 <if test="query.electronicNumberOrName != null"> and( ef.electronic_name like concat('%',#{query.electronicNumberOrName},'%') or ef.electronic_number like concat('%',#{query.electronicNumberOrName},'%') ) </if> <if test="query.electronicAreaId != null"> and efa.id = #{query.electronicAreaId} </if> <if test="query.status != null"> and ef.status = #{query.status} </if> <if test="query.createBy != null and query.createBy!=''"> and ef.create_by like concat('%',#{query.createBy},'%') </if> <if test="query.createStartTime != null and query.createStartTime!=''"> and ef.create_time >= #{query.createStartTime} </if> <if test="query.createEndTime != null and query.createEndTime!=''"> and #{query.createEndTime} >= ef.create_time </if> <if test="query.updateBy != null and query.updateBy!=''"> and ef.update_by like concat('%',#{query.updateBy},'%') </if> <if test="query.updateStartTime != null and query.updateStartTime!=''"> and ef.update_time >= #{query.updateStartTime} </if> <if test="query.updateEndTime != null and query.updateEndTime!=''"> and #{query.updateEndTime} >= ef.update_time </if> group by ef.id <if test="query.createSort != null and query.updateSort != null"> order by <if test="query.createSort == 1"> ef.create_time asc, </if> <if test="query.createSort == 2"> ef.create_time desc, </if> <if test="query.updateSort == 1"> ef.update_time asc </if> <if test="query.updateSort == 2"> ef.update_time desc </if> </if> <if test="query.createSort != null"> order by <if test="query.createSort == 1"> ef.create_time asc </if> <if test="query.createSort == 2"> ef.create_time desc </if> </if> <if test="query.updateSort != null"> order by <if test="query.updateSort == 1"> ef.update_time asc </if> <if test="query.updateSort == 2"> ef.update_time desc </if> </if> </select> </mapper> xp-robotaxi-map-boot/src/main/resources/mapper/XpRegionMapper.xml
File was deleted xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/ReassignOrderController.java
@@ -1,8 +1,5 @@ package com.xiaopeng.operation.controller; import com.xiaopeng.api.feignClient.order.XpOrderClient; import com.xiaopeng.api.feignClient.order.XpReassignOrderClient; import com.xiaopeng.api.model.order.XpOrderReassign; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.api.dto.operation.ReassignOrderDTO; import com.xiaopeng.operation.utils.TaskOrderUtil; @@ -11,8 +8,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; /** * token 控制 @@ -24,21 +19,9 @@ public class ReassignOrderController { @Autowired private TaskOrderUtil taskOrderUtil; @Autowired private XpReassignOrderClient xpReassignOrderClient; @PostMapping("/inner/v1/order/reassignOrder") public R<String> reassignOrder(@RequestBody ReassignOrderDTO dto) { //新增改派数据 XpOrderReassign xpOrderReassign = new XpOrderReassign(); xpOrderReassign.setOrderId(dto.getOrderId()); xpOrderReassign.setOperationTime(LocalDateTime.now()); xpOrderReassign.setOldVehicleId(dto.getVehicleId()); xpOrderReassign.setOldFleetId(dto.getFleetId()); xpOrderReassign.setReassignReason("异常改派"); xpReassignOrderClient.saveReassignOrder(xpOrderReassign); taskOrderUtil.reassignPushOrder(dto.getCount(),dto.getUid(),dto.getLongitude(),dto.getLatitude(),dto.getOrderNo()); return R.ok(); }
