Merge remote-tracking branch 'origin/master'

“mitao”

2026-04-03 5c205b8b39d1ee399f1509523709e748f2cfbc74

Merge remote-tracking branch 'origin/master'

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

@@ -1005,6 +1005,17 @@
        return R.ok(hvacInnerTemp.getValue());
    }



    @ApiOperation(value = "通过订单id查询当前车辆车门状态", tags = {"小程序-业务流程"})
    @GetMapping("/api/v1/mini-program/order/queryVehicleTrunkOpenStatus")
    public R<VehicleTemperatureDto> queryVehicleTrunkOpenStatus(@RequestParam Long orderId, HttpServletRequest request) {
        String uid = request.getHeader("XP-Uid");
        VehicleTemperatureDto vehicleTemperatureDto = xpVehicleService.queryTemperatureByOrderId(orderId,uid);
        return R.ok(vehicleTemperatureDto);
    }


    /**
     * 获取车辆不分页列表
     *

 xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/util/VehicleControlUtil.java

@@ -42,7 +42,8 @@
    public VehicleTemperatureDto queryVehicleTemperature(String uid, String vin) {
        String nonce = System.currentTimeMillis() + "";
        Set<String> stateList = Collections.singleton("hvacInnerTemp");
        stateList.add("trunkAjarCloseSt");
        stateList.add("trunkAjarCloseSt");//后备箱开合状态0-关闭;1-打开
        stateList.add("driverDoorLockSt");//车门解锁状态0-unlock;1-locked
        Map<String, String> map = new HashMap<>();
        map.put("nonce", nonce);
        map.put("openId", OPEN_ID_ROBOT_TAXI);