xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/mapper/SysGroupMapper.java
@@ -4,6 +4,7 @@ import com.xiaopeng.account.model.query.GroupUserPageQuery; import com.xiaopeng.account.model.vo.GroupUserVO; import com.xiaopeng.api.model.account.SysGroup; import com.xiaopeng.common.core.web.page.PageInfo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,8 +30,9 @@ /** * 查询权限组绑定用户列表 * * @param query 查询参数 * @param pageInfo * @param query 查询参数 * @return 用户列表 */ List<GroupUserVO> queryUserPageList(@Param("query") GroupUserPageQuery query); PageInfo<GroupUserVO> queryUserPageList(PageInfo<GroupUserVO> pageInfo, @Param("query") GroupUserPageQuery query); } xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/SysRoleDetailVO.java
@@ -21,6 +21,9 @@ @ApiModelProperty(value = "权限组id") private Long groupId; @ApiModelProperty(value = "权限组名称") private String groupName; @ApiModelProperty(value = "角色名称") private String roleName;
@@ -203,12 +203,9 @@ // 分页查询 PageInfo<GroupUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); query.setGroupType(group.getGroupType()); List<GroupUserVO> records = baseMapper.queryUserPageList(query); PageInfo<GroupUserVO> records = baseMapper.queryUserPageList(pageInfo, query); // 手动设置分页信息（因为使用了自定义SQL） pageInfo.setRecords(records); pageInfo.setTotal((long) records.size()); return pageInfo; }
@@ -15,9 +15,11 @@ import com.xiaopeng.account.model.vo.SysRoleDetailVO; import com.xiaopeng.account.model.vo.SysRolePageVO; import com.xiaopeng.account.service.ISysGroupMenuService; import com.xiaopeng.account.service.ISysGroupService; import com.xiaopeng.account.service.ISysRoleService; import com.xiaopeng.account.service.ISysUserRoleService; import com.xiaopeng.api.feignClient.operation.SysMenuClient; import com.xiaopeng.api.model.account.SysGroup; import com.xiaopeng.api.model.account.SysRole; import com.xiaopeng.api.model.account.SysUserRole; import com.xiaopeng.api.model.account.XpOperationsRole; @@ -57,6 +59,8 @@ private final SysRoleMenuMapper sysRoleMenuMapper; private final XpOperationsRoleMapper xpOperationsRoleMapper; private final ISysGroupService sysGroupService; /** * 根据角色ID查询权限组ID @@ -164,7 +168,11 @@ } SysRoleDetailVO vo = BeanUtil.toBean(role, SysRoleDetailVO.class); //查询关联权限组 if (Objects.nonNull(vo.getGroupId())) { SysGroup sysGroup = sysGroupService.getById(vo.getGroupId()); vo.setGroupName(sysGroup != null ? sysGroup.getGroupName() : null); } // 根据权限组ID获取菜单ID列表 List<Long> menuIds = groupMenuService.selectMenuIdsByGroupId(role.getGroupId()); if (CollectionUtils.isEmpty(menuIds)) { xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/constant/I18nKeyConstant.java
@@ -87,4 +87,14 @@ String CRUISE_PLAN_EDIT_FAIL = "cruise.plan.edit.fail"; //手机号格式错误 String ACCOUNT_FORMAT_ERROR = "account.format.error"; // 邀请码导入校验 String INVITATION_IMPORT_VALIDATE_FAIL = "invitation.import.validate.fail"; String INVITATION_IMPORT_DATA_EMPTY = "invitation.import.data.empty"; String INVITATION_IMPORT_ACCOUNT_EMPTY = "invitation.import.account.empty"; String INVITATION_IMPORT_ACCOUNT_INVALID = "invitation.import.account.invalid"; String INVITATION_IMPORT_CODE_EMPTY = "invitation.import.code.empty"; String INVITATION_IMPORT_CODE_CONTAINS_CHINESE = "invitation.import.code.contains.chinese"; String INVITATION_IMPORT_CODE_DUPLICATE = "invitation.import.code.duplicate"; String INVITATION_IMPORT_CODE_EXISTS = "invitation.import.code.exists"; } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
@@ -6,10 +6,9 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.hutool.core.util.PhoneUtil; import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.xiaopeng.api.model.account.SysUser; import com.xiaopeng.api.model.operation.XpInvitationCode; import com.xiaopeng.api.model.operation.XpWhitelist; import com.xiaopeng.common.core.domain.R; @@ -17,21 +16,18 @@ import com.xiaopeng.common.core.utils.DateUtils; import com.xiaopeng.common.core.utils.WebUtils; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.common.log.annotation.Log; import com.xiaopeng.common.log.enums.BusinessType; import com.xiaopeng.operation.constant.I18nKeyConstant; import com.xiaopeng.operation.dto.InvitationAddDto; import com.xiaopeng.operation.exportExcle.XpInvitationCodeExportExcel; import com.xiaopeng.operation.exportExcle.XpWhitelistExportExcel; import com.xiaopeng.operation.importExcel.InvitationCodeImportExcel; import com.xiaopeng.operation.query.InvitationPageListQuery; import com.xiaopeng.operation.query.WhitelistPageListQuery; import com.xiaopeng.operation.service.IXpInvitationCodeService; import com.xiaopeng.operation.service.IXpWhitelistService; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.transaction.annotation.Propagation; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -41,7 +37,6 @@ import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URLEncoder; @@ -49,6 +44,7 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; import java.util.regex.Pattern; /** * <p> @@ -67,6 +63,10 @@ private IXpInvitationCodeService xpInvitationCodeService; @Resource private IXpWhitelistService xpWhitelistService; @Resource private MessageSource messageSource; private static final Pattern CHINESE_PATTERN = Pattern.compile("\\p{IsHan}"); @ApiOperation(value = "邀请码管理分页列表",response = XpInvitationCode.class) @PostMapping("/api/v1/invitation/pageList") @@ -135,9 +135,6 @@ @ApiOperation(value = "邀请码导入") @PostMapping("/base/v1/invitation/importExcel") public R<String> importExcel(@RequestPart("file") MultipartFile file) { System.out.println("文件名 = " + file.getOriginalFilename()); System.out.println("文件大小 = " + file.getSize()); System.out.println("ContentType = " + file.getContentType()); ImportParams params = new ImportParams(); params.setHeadRows(1); //表头行数 InputStream inputStream = null; @@ -152,31 +149,87 @@ throw new ServiceException("邀请码导入失败!"); } finally { try { inputStream.close(); if (inputStream != null) { inputStream.close(); } } catch (IOException e) { throw new ServiceException(e.getMessage()); } } if (CollectionUtils.isEmpty(invitationCodeImportExcels)) { throw new ServiceException("邀请码数据为空!"); return R.fail(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_DATA_EMPTY, null, I18nKeyConstant.INVITATION_IMPORT_DATA_EMPTY, LocaleContextHolder.getLocale())); } // 校验邀请码是否有重复的 long count = invitationCodeImportExcels.stream().map(InvitationCodeImportExcel::getInvitationCode) .distinct().count(); if (count!=invitationCodeImportExcels.size()){ return R.fail("邀请码存在重复!"); // 批量校验：账号必须为手机号；邀请码不能为空且不能包含中文；同时校验文件内重复/数据库已存在 List<String> errors = new ArrayList<>(); Set<String> importCodes = new HashSet<>(); for (int i = 0; i < invitationCodeImportExcels.size(); i++) { InvitationCodeImportExcel row = invitationCodeImportExcels.get(i); int rowNum = i + 2; String invitationCode = trimToNull(row.getInvitationCode()); String bindAccount = trimToNull(row.getBindAccount()); row.setInvitationCode(invitationCode); row.setBindAccount(bindAccount); if (!StringUtils.hasLength(invitationCode)) { errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_EMPTY, new Object[]{rowNum}, I18nKeyConstant.INVITATION_IMPORT_CODE_EMPTY, LocaleContextHolder.getLocale())); } else { if (containsChinese(invitationCode)) { errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_CONTAINS_CHINESE, new Object[]{rowNum, bindAccount}, I18nKeyConstant.INVITATION_IMPORT_CODE_CONTAINS_CHINESE, LocaleContextHolder.getLocale())); } importCodes.add(invitationCode); } if (!StringUtils.hasLength(bindAccount)) { errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_EMPTY, new Object[]{rowNum}, I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_EMPTY, LocaleContextHolder.getLocale())); } else if (!PhoneUtil.isPhone(bindAccount)) { errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_INVALID, new Object[]{rowNum, bindAccount}, I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_INVALID, LocaleContextHolder.getLocale())); } if (StringUtils.hasLength(row.getBindTime())) { row.setBindTime(row.getBindTime().trim()); } } Map<String, Long> codeMap = xpInvitationCodeService.list().stream() .collect(Collectors.toMap(XpInvitationCode::getInvitationCode, XpInvitationCode::getId)); JSONObject result = new JSONObject(); Map<String, Long> codeCountMap = invitationCodeImportExcels.stream() .map(InvitationCodeImportExcel::getInvitationCode) .filter(StringUtils::hasLength) .collect(Collectors.groupingBy(code -> code, Collectors.counting())); List<String> duplicatedCodes = codeCountMap.entrySet().stream() .filter(entry -> entry.getValue() != null && entry.getValue() > 1) .map(Map.Entry::getKey) .sorted() .collect(Collectors.toList()); if (!duplicatedCodes.isEmpty()) { errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_DUPLICATE, new Object[]{String.join(",", duplicatedCodes)}, I18nKeyConstant.INVITATION_IMPORT_CODE_DUPLICATE, LocaleContextHolder.getLocale())); } if (!importCodes.isEmpty()) { List<XpInvitationCode> existsList = xpInvitationCodeService.lambdaQuery() .in(XpInvitationCode::getInvitationCode, importCodes) .list(); if (!CollectionUtils.isEmpty(existsList)) { List<String> existsCodes = existsList.stream() .map(XpInvitationCode::getInvitationCode) .filter(StringUtils::hasLength) .distinct() .sorted() .collect(Collectors.toList()); if (!existsCodes.isEmpty()) { errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_EXISTS, new Object[]{String.join(",", existsCodes)}, I18nKeyConstant.INVITATION_IMPORT_CODE_EXISTS, LocaleContextHolder.getLocale())); } } } if (!errors.isEmpty()) { return R.fail(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_VALIDATE_FAIL, new Object[]{String.join("\n", errors)},I18nKeyConstant.INVITATION_IMPORT_VALIDATE_FAIL, LocaleContextHolder.getLocale())); } List<XpInvitationCode> addList = new ArrayList<>(); List<XpWhitelist> addWhitelistList = new ArrayList<>(); for (InvitationCodeImportExcel locationExcel : invitationCodeImportExcels) { Long id = codeMap.get(locationExcel.getInvitationCode()); if (id!=null){ result.append("邀请码：[", locationExcel.getInvitationCode()+"]已存在"); } locationExcel.setBindTime(locationExcel.getBindTime()); XpInvitationCode xpInvitationCode = new XpInvitationCode(); xpInvitationCode.setInvitationCode(locationExcel.getInvitationCode()); @@ -188,11 +241,7 @@ } xpInvitationCode.setBindTime(DateUtils.stringToLocalDateTime(locationExcel.getBindTime())); if (StringUtils.hasLength(locationExcel.getBindAccount())){ xpInvitationCode.setStatus(2); }else{ xpInvitationCode.setStatus(1); } xpInvitationCode.setStatus(2); XpWhitelist xpWhitelist = new XpWhitelist(); xpWhitelist.setAccount(locationExcel.getBindAccount()); xpWhitelist.setStatus(true); @@ -201,13 +250,25 @@ addWhitelistList.add(xpWhitelist); addList.add(xpInvitationCode); } if(!result.isEmpty()){ return R.ok(result.toString()); } xpInvitationCodeService.saveBatch(addList); xpWhitelistService.saveBatch(addWhitelistList); return R.ok(); } private static String trimToNull(String value) { if (!StringUtils.hasLength(value)) { return null; } String trimmed = value.trim(); return StringUtils.hasLength(trimmed) ? trimmed : null; } private static boolean containsChinese(String value) { if (!StringUtils.hasLength(value)) { return false; } return CHINESE_PATTERN.matcher(value).find(); } @ApiOperation(value = "邀请码导出") @PostMapping(value = "/api/v1/invitation/exportExcel") public void exportExcel(@RequestBody InvitationPageListQuery query) { xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/RoutePlanAddDTO.java
@@ -24,7 +24,6 @@ private String planName; @ApiModelProperty(value = "备注", required = true) @NotBlank(message = "备注不能为空") private String remarks; @ApiModelProperty(value = "路线规划规则", required = true) xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/RoutePlanEditDTO.java
@@ -32,7 +32,6 @@ private String planName; @ApiModelProperty(value = "备注", required = true) @NotBlank(message = "备注不能为空") private String remarks; @ApiModelProperty(value = "路线规划规则", required = true) xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
@@ -91,13 +91,17 @@ @Override public PageInfo<XpOpenCity> getPageList(OpenCityPageQuery query) { Page<XpOpenCity> page = lambdaQuery().like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getCityName, query.getCityName()) .eq(Objects.nonNull(query.getStatus()), XpOpenCity::getStatus, query.getStatus()) .orderByDesc(XpOpenCity::getCreateTime) .page(new Page<>(query.getPageNum(), query.getPageSize())); PageInfo<XpOpenCity> pageInfo = new PageInfo<>(); pageInfo.setRecords(page.getRecords()); pageInfo.setTotal(page.getTotal()); LambdaQueryWrapper<XpOpenCity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(query.getCityName())) { lambdaQueryWrapper.or(ew -> ew.like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getProvinceName, query.getCityName())) .or(ew -> ew.like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getCityName, query.getCityName())) .or(ew -> ew.like(StringUtils.isNotBlank(query.getCityName()), XpOpenCity::getDistrictName, query.getCityName())); } if (Objects.nonNull(query.getStatus())) { lambdaQueryWrapper.eq(XpOpenCity::getStatus, query.getStatus()); } lambdaQueryWrapper.orderByDesc(XpOpenCity::getCreateTime); PageInfo<XpOpenCity> pageInfo = page(new PageInfo<>(query.getPageNum(), query.getPageSize()), lambdaQueryWrapper); return pageInfo; }
@@ -35,3 +35,11 @@ cruise.plan.add.fail=新增巡游计划失败 cruise.plan.edit.fail=编辑巡游计划失败 account.format.error=以下帐号格式不正确：{0} invitation.import.validate.fail=导入校验失败：\n{0} invitation.import.data.empty=邀请码数据为空 invitation.import.account.empty=第{0}行绑定账号不能为空 invitation.import.account.invalid=第{0}行绑定账号不是合法手机号：{1} invitation.import.code.empty=第{0}行邀请码不能为空 invitation.import.code.contains.chinese=第{0}行邀请码包含中文：{1} invitation.import.code.duplicate=导入文件中邀请码重复：{0} invitation.import.code.exists=以下邀请码已存在：{0} xp-robotaxi-operation-boot/src/main/resources/i18n/messages_en_US.properties
@@ -28,3 +28,11 @@ cruise.plan.vehicle.already.bound=Vehicle [{0}] has been associated with other cruising plans cruise.plan.add.fail=The new cruise plan failed account.format.error=The following account format is incorrect: {0} invitation.import.validate.fail=Import validation failed:\n{0} invitation.import.data.empty=Invitation code data is empty invitation.import.account.empty=Row {0}: bound account is required invitation.import.account.invalid=Row {0}: bound account is not a valid phone number: {1} invitation.import.code.empty=Row {0}: invitation code is required invitation.import.code.contains.chinese=Row {0}: invitation code contains Chinese characters: {1} invitation.import.code.duplicate=Duplicate invitation codes in file: {0} invitation.import.code.exists=The following invitation codes already exist: {0} xp-robotaxi-operation-boot/src/main/resources/i18n/messages_zh_CN.properties
@@ -28,3 +28,11 @@ cruise.plan.vehicle.already.bound=车辆[{0}]已关联其他巡游计划 cruise.plan.add.fail=新增巡游计划失败 account.format.error=以下帐号格式不正确：{0} invitation.import.validate.fail=导入校验失败：\n{0} invitation.import.data.empty=邀请码数据为空 invitation.import.account.empty=第{0}行绑定账号不能为空 invitation.import.account.invalid=第{0}行绑定账号不是合法手机号：{1} invitation.import.code.empty=第{0}行邀请码不能为空 invitation.import.code.contains.chinese=第{0}行邀请码包含中文：{1} invitation.import.code.duplicate=导入文件中邀请码重复：{0} invitation.import.code.exists=以下邀请码已存在：{0} xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/exportExcel/XpOrderExportExcel.java
@@ -26,7 +26,7 @@ private LocalDateTime createTime; @ApiModelProperty(value = "订单来源") @Excel(name = "订单来源", width = 15, replace = {"APP下单_1"}) @Excel(name = "订单来源", width = 15, replace = {"小鹏小程序_1"}) private String orderSource; @ApiModelProperty(value = "乘车时间") xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/query/XpOrderPageQuery.java
@@ -34,7 +34,7 @@ @ApiModelProperty(value = "订单来源 1=APP下单") private Integer orderSource; @ApiModelProperty(value = "下单城市") @ApiModelProperty(value = "下单城市编码（支持省/市/区adcode；省按前2位匹配、市按前4位匹配、区县精确匹配）") private String cityCode; @ApiModelProperty(value = "状态 0=已取消，1=待接单，2=待出发，3=待到达预约点，4=待乘客上车，5=服务中，6=待支付，7=待评价，8=已完成") xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java
@@ -11,7 +11,7 @@ import com.xiaopeng.api.model.order.XpCruiseOrder; import com.xiaopeng.api.model.vehicleConvoy.XpFleet; import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType; import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperationType; import com.xiaopeng.common.core.domain.R; import com.xiaopeng.common.core.utils.StringUtils; import com.xiaopeng.common.core.web.domain.BaseModel; xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java
@@ -206,7 +206,7 @@ vo.setEvaluateTime(evaluate.getEvaluateTime()); // 用户信息 if (Objects.nonNull(evaluate.getAppUserId()) && userInfoMap.containsKey(evaluate.getAppUserId().toString())) { if (Objects.nonNull(evaluate.getAppUserId()) && userInfoMap != null && userInfoMap.containsKey(evaluate.getAppUserId().toString())) { UcUserInfo userInfo = userInfoMap.get(evaluate.getAppUserId().toString()); vo.setNickName(userInfo.getNickName()); vo.setPhoneNumber(userInfo.getMobile()); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -87,6 +87,7 @@ import com.xiaopeng.order.service.IXpOrderReassignService; import com.xiaopeng.order.service.IXpOrderService; import com.xiaopeng.order.utils.TaxiPricingDemoService; import com.xiaopeng.order.utils.RegionCodeFilterUtil; import com.xiaopeng.order.utils.holiday.HolidayUtil; import com.xiaopeng.order.vo.OrderDetailVo; import lombok.RequiredArgsConstructor; @@ -184,8 +185,28 @@ @Override public PageInfo<XpOrderPageVO> pageList(XpOrderPageQuery query) { // 0. 车牌号筛选：先查车辆服务获取车辆ID列表 List<Long> vehicleIdsFilter = null; if (StringUtils.isNotBlank(query.getPlateNumber())) { R<List<XpVehicle>> vehicleResult = xpVehicleClient.listByPlateNumber(query.getPlateNumber()); if (vehicleResult == null || CollectionUtils.isEmpty(vehicleResult.getData())) { return buildEmptyOrderPage(query); } vehicleIdsFilter = vehicleResult.getData().stream() .map(XpVehicle::getId) .filter(Objects::nonNull) .distinct() .collect(Collectors.toList()); if (CollectionUtils.isEmpty(vehicleIdsFilter)) { return buildEmptyOrderPage(query); } } // 1. 构建查询条件 LambdaQueryWrapper<XpOrder> wrapper = buildQueryWrapper(query); if (CollUtil.isNotEmpty(vehicleIdsFilter)) { wrapper.in(XpOrder::getVehicleId, vehicleIdsFilter); } wrapper.orderByDesc(XpOrder::getCreateTime); // 2. 分页查询 @@ -193,10 +214,7 @@ Page<XpOrder> pageResult = this.page(page, wrapper); if (CollectionUtils.isEmpty(pageResult.getRecords())) { PageInfo<XpOrderPageVO> resultPage = new PageInfo<>(query.getPageNum(), query.getPageSize()); resultPage.setTotal(0L); resultPage.setRecords(new ArrayList<>()); return resultPage; return buildEmptyOrderPage(query); } // 3. 收集关联ID @@ -229,6 +247,13 @@ PageInfo<XpOrderPageVO> resultPage = new PageInfo<>(query.getPageNum(), query.getPageSize()); resultPage.setTotal(pageResult.getTotal()); resultPage.setRecords(voList); return resultPage; } private PageInfo<XpOrderPageVO> buildEmptyOrderPage(XpOrderPageQuery query) { PageInfo<XpOrderPageVO> resultPage = new PageInfo<>(query.getPageNum(), query.getPageSize()); resultPage.setTotal(0L); resultPage.setRecords(new ArrayList<>()); return resultPage; } @@ -303,6 +328,23 @@ // 1. 构建查询条件 LambdaQueryWrapper<XpOrder> wrapper = buildExcelQueryWrapper(query); // 1.1 车牌号筛选：先查车辆服务获取车辆ID列表 if (StringUtils.isNotBlank(query.getPlateNumber())) { R<List<XpVehicle>> vehicleResult = xpVehicleClient.listByPlateNumber(query.getPlateNumber()); if (vehicleResult == null || CollectionUtils.isEmpty(vehicleResult.getData())) { return new ArrayList<>(); } List<Long> vehicleIdsFilter = vehicleResult.getData().stream() .map(XpVehicle::getId) .filter(Objects::nonNull) .distinct() .collect(Collectors.toList()); if (CollectionUtils.isEmpty(vehicleIdsFilter)) { return new ArrayList<>(); } wrapper.in(XpOrder::getVehicleId, vehicleIdsFilter); } // 2. 查询订单列表 List<XpOrder> orderList = this.list(wrapper); @@ -346,8 +388,16 @@ wrapper.like(StringUtils.isNotBlank(query.getOrderNumber()), XpOrder::getOrderNumber, query.getOrderNumber()) .eq(Objects.nonNull(query.getFleetId()), XpOrder::getFleetId, query.getFleetId()) .eq(Objects.nonNull(query.getOrderSource()), XpOrder::getOrderSource, query.getOrderSource()) .like(StringUtils.isNotBlank(query.getCityCode()), XpOrder::getCityCode, query.getCityCode()) .eq(Objects.nonNull(query.getStatus()), XpOrder::getStatus, query.getStatus()); RegionCodeFilterUtil.resolveCityCodeFilter(query.getCityCode()) .ifPresent(filter -> { if (RegionCodeFilterUtil.MatchType.LIKE_RIGHT.equals(filter.getMatchType())) { wrapper.likeRight(XpOrder::getCityCode, filter.getValue()); } else { wrapper.eq(XpOrder::getCityCode, filter.getValue()); } }); if (Objects.nonNull(query.getStartTime())) { wrapper.ge(XpOrder::getCreateTime, LocalDateTime.of(query.getStartTime(), LocalTime.MIN)); @@ -364,8 +414,16 @@ wrapper.like(StringUtils.isNotBlank(query.getOrderNumber()), XpOrder::getOrderNumber, query.getOrderNumber()) .eq(Objects.nonNull(query.getFleetId()), XpOrder::getFleetId, query.getFleetId()) .eq(Objects.nonNull(query.getOrderSource()), XpOrder::getOrderSource, query.getOrderSource()) .like(StringUtils.isNotBlank(query.getCityCode()), XpOrder::getCityCode, query.getCityCode()) .eq(Objects.nonNull(query.getStatus()), XpOrder::getStatus, query.getStatus()); RegionCodeFilterUtil.resolveCityCodeFilter(query.getCityCode()) .ifPresent(filter -> { if (RegionCodeFilterUtil.MatchType.LIKE_RIGHT.equals(filter.getMatchType())) { wrapper.likeRight(XpOrder::getCityCode, filter.getValue()); } else { wrapper.eq(XpOrder::getCityCode, filter.getValue()); } }); if (Objects.nonNull(query.getStartTime())) { wrapper.ge(XpOrder::getCreateTime, LocalDateTime.of(query.getStartTime(), LocalTime.MIN)); @@ -379,6 +437,7 @@ wrapper.orderByDesc(XpOrder::getCreateTime); return wrapper; } /** * 批量获取用户信息 */ @@ -531,7 +590,7 @@ PushOrderDto pushOrderDto = new PushOrderDto(); pushOrderDto.setOrderId(order.getId().toString()); pushOrderDto.setVin(xpVehicleR.getData().getVehicleVin()); pushOrderDto.setOperation_type(com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType.CLOUD_CANCEL_ORDER); // pushOrderDto.setOperation_type(com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType.CLOUD_CANCEL_ORDER); orderMissionClient.cancelOrder(pushOrderDto); } } else { xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/RegionCodeFilterUtil.java
New file @@ -0,0 +1,75 @@ package com.xiaopeng.order.utils; import com.xiaopeng.common.core.utils.StringUtils; import java.util.Objects; import java.util.Optional; public final class RegionCodeFilterUtil { private RegionCodeFilterUtil() { } public enum MatchType { EQ, LIKE_RIGHT } public static final class CityCodeFilter { private final MatchType matchType; private final String value; private CityCodeFilter(MatchType matchType, String value) { this.matchType = matchType; this.value = value; } public MatchType getMatchType() { return matchType; } public String getValue() { return value; } } public static Optional<CityCodeFilter> resolveCityCodeFilter(String cityCode) { if (StringUtils.isBlank(cityCode)) { return Optional.empty(); } String trimmed = cityCode.trim(); if (StringUtils.isBlank(trimmed)) { return Optional.empty(); } if (trimmed.length() == 6) { if (trimmed.endsWith("0000")) { return Optional.of(new CityCodeFilter(MatchType.LIKE_RIGHT, safeSubstring(trimmed, 0, 2))); } if (trimmed.endsWith("00")) { return Optional.of(new CityCodeFilter(MatchType.LIKE_RIGHT, safeSubstring(trimmed, 0, 4))); } return Optional.of(new CityCodeFilter(MatchType.EQ, trimmed)); } if (trimmed.length() == 2 || trimmed.length() == 4) { return Optional.of(new CityCodeFilter(MatchType.LIKE_RIGHT, trimmed)); } return Optional.of(new CityCodeFilter(MatchType.EQ, trimmed)); } private static String safeSubstring(String str, int start, int end) { if (StringUtils.isBlank(str)) { return ""; } int safeStart = Math.max(0, start); int safeEnd = Math.min(str.length(), end); if (safeStart >= safeEnd) { return ""; } return Objects.toString(str.substring(safeStart, safeEnd), ""); } }
@@ -13,6 +13,7 @@ import com.xiaopeng.api.model.operation.XpElectronicFence; import com.xiaopeng.api.model.operation.XpElectronicFenceArea; import com.xiaopeng.api.model.order.XpOrder; import com.xiaopeng.api.model.vehicleConvoy.XpFleetVehicle; import com.xiaopeng.api.model.vehicleConvoy.XpVehicle; import com.xiaopeng.api.model.vehicleConvoy.XpVehicleAnnualRecord; import com.xiaopeng.api.vo.automaticPilot.VehiclePosition; @@ -32,6 +33,7 @@ import com.xiaopeng.vehicleConvoy.model.query.*; import com.xiaopeng.vehicleConvoy.model.vo.XpVehicleVO; import com.xiaopeng.vehicleConvoy.service.IXpVehicleAnnualRecordService; import com.xiaopeng.vehicleConvoy.service.IXpFleetVehicleService; import com.xiaopeng.vehicleConvoy.service.IXpVehicleService; import com.xiaopeng.vehicleConvoy.util.VehicleControlUtil; import lombok.extern.slf4j.Slf4j; @@ -75,10 +77,12 @@ @Autowired private XpElectronicClient xpElectronicClient; @Autowired private IXpVehicleAnnualRecordService xpVehicleAnnualRecordService; @Resource private XpuVinClient xpuVinClient; @Autowired private IXpVehicleAnnualRecordService xpVehicleAnnualRecordService; @Autowired private IXpFleetVehicleService xpFleetVehicleService; @Resource private XpuVinClient xpuVinClient; @Autowired private RedisService redisService; @Autowired @@ -489,9 +493,22 @@ List<String> ids = Arrays.asList(idStr.split(",")); // 查询车辆完整信息 List<XpVehicle> vehicles = this.listByIds(ids); List<Long> vehicleIdList = vehicles.stream() .map(XpVehicle::getId) .filter(Objects::nonNull) .collect(Collectors.toList()); Set<Long> boundVehicleIdSet = CollUtil.isEmpty(vehicleIdList) ? Collections.emptySet() : xpFleetVehicleService.lambdaQuery() .in(XpFleetVehicle::getVehicleId, vehicleIdList) .list() .stream() .map(XpFleetVehicle::getVehicleId) .filter(Objects::nonNull) .collect(Collectors.toSet()); LocalDate now = LocalDate.now(); List<String> errorMessages = new ArrayList<>(); for (XpVehicle vehicle : vehicles) { List<String> reasons = new ArrayList<>(); Locale locale = LocaleContextHolder.getLocale(); @@ -504,6 +521,15 @@ reasons.add("Status is not 'Pending Operation'"); } } // 校验车辆是否绑定车队 if (vehicle.getId() == null || !boundVehicleIdSet.contains(vehicle.getId())) { if ("zh".equals(locale.getLanguage())) { reasons.add("操作失败，车辆未绑定车队"); } else { reasons.add("Operation failed, vehicle is not bound to a fleet"); } } // 校验年检到期时间 if (vehicle.getAnnualInspectionDate() == null || vehicle.getAnnualInspectionDate().toLocalDate().isBefore(now)) { if ("zh".equals(locale.getLanguage())) {
