修改bug

puzhibing

2026-05-13 af7d191d6d333a2f4d851da4508ffaa99ac5389e

修改bug

 xp-robotaxi-common/xp-common-core/src/main/java/com/xiaopeng/common/core/utils/AESUtil.java

@@ -172,6 +172,7 @@
            byte[] encrypted = cipher.doFinal(data.getBytes(StandardCharsets.UTF_8));
            return Base64.getEncoder().encodeToString(encrypted);
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException("ECB 加密失败", e);
        }
    }

 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpVehicleModelController.java

@@ -36,7 +36,7 @@


    @ApiOperation(value = "车型分页列表", tags = "管理后台-资产-车型管理")
    @PostMapping("/logan/inner/xpVehicleModel/pageList")
    @PostMapping("/api/v1/xpVehicleModel/pageList")
    public R<PageInfo<XpVehicleModel>> pageList(@RequestBody XpVehicleModelPageQuery query) {
        PageInfo<XpVehicleModel> pageInfo = xpVehicleModelService.pageList(query);
        return R.ok(pageInfo);
@@ -54,7 +54,7 @@


    @ApiOperation(value = "车型根据ID查询", tags = "管理后台-资产-车型管理")
    @GetMapping("/logan/inner/xpVehicleModel/getById")
    @GetMapping("/api/v1/xpVehicleModel/getById")
    public R<XpVehicleModel> getById(@RequestParam String id) {
        if (id == null || id.isEmpty()) {
            return R.fail("参数错误");
@@ -68,7 +68,7 @@
    
    
    @ApiOperation(value = "车型新增", tags = "管理后台-资产-车型管理")
    @PostMapping("/logan/inner/xpVehicleModel/add")
    @PostMapping("/api/v1/xpVehicleModel/add")
    @AdminOperationLog(
            businessType = AdminBusinessType.VEHICLE_MODEL_MANAGEMENT,
            operationType = AdminOperationType.ADD,
@@ -89,7 +89,7 @@
    }

    @ApiOperation(value = "车型编辑", tags = "管理后台-资产-车型管理")
    @PostMapping("/logan/inner/xpVehicleModel/edit")
    @PostMapping("/api/v1/xpVehicleModel/edit")
    @AdminOperationLog(
            businessType = AdminBusinessType.VEHICLE_MODEL_MANAGEMENT,
            operationType = AdminOperationType.EDIT,
@@ -118,7 +118,7 @@
    }

    @ApiOperation(value = "车型删除", tags = "管理后台-资产-车型管理")
    @DeleteMapping("/logan/inner/xpVehicleModel/deleteById")
    @DeleteMapping("/api/v1/xpVehicleModel/deleteById")
    @AdminOperationLog(
            businessType = AdminBusinessType.VEHICLE_MODEL_MANAGEMENT,
            operationType = AdminOperationType.DELETE,
@@ -150,7 +150,7 @@

    
    @ApiOperation(value = "车型全列表查询", tags = "管理后台-车型全列表查询")
    @PostMapping("/logan/inner/xpVehicleModel/list")
    @PostMapping("/api/v1/xpVehicleModel/list")
    public R<List<XpVehicleModel>> list() {
        List<XpVehicleModel> list = xpVehicleModelService.queryList();
        return R.ok(list);

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java

@@ -207,6 +207,14 @@
        List<XpActivity> list = xpActicityService.list(new QueryWrapper<XpActivity>().in("status", Arrays.asList(1, 2)).eq("is_deleted", 0));
        for (XpActivity xpActivity : list) {
            Integer status = xpActivity.getStatus();
            //即将开始的活动推送socket给前端用户
            if(1 == status && LocalDateTime.now().isBefore(xpActivity.getStartTime())){

            }

            //即将结束的活动推送给前端用户
            
            //生效的活动修改状态和发放一次优惠券
            if(1 == status && LocalDateTime.now().isAfter(xpActivity.getStartTime()) && LocalDateTime.now().isBefore(xpActivity.getEndTime())){
                xpActivity.setStatus(2);
                //发放优惠券-发放一次的优惠券
@@ -216,7 +224,9 @@
                    pushCoupon(xpActivity, xpActicityStrategy);
                }

            }else if(2 == status & LocalDateTime.now().isAfter(xpActivity.getEndTime())){
            }
            //到期的活动修改状态为已结束
            if(2 == status & LocalDateTime.now().isAfter(xpActivity.getEndTime())){
                xpActivity.setStatus(3);
            }
            xpActicityService.updateById(xpActivity);

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java

@@ -1338,7 +1338,7 @@
        return R.ok(vehicle);
    }

    private List<String> buildVinQueryValues(List<String> vinList) {
    private List<String> buildVinQueryValues(Set<String> vinList) {
        if (vinList == null || vinList.isEmpty()) {
            return java.util.Collections.emptyList();
        }