Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-04-30 f8dc6c398466401357277abb35dd2641e0397086

Merge remote-tracking branch 'origin/1.0' into 1.0

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

@@ -1016,12 +1016,13 @@
    @XpClientCheck(checkToken = false, checkOtpToken = true)
    public R<String> queryTemperatureByOrderId(@RequestParam Long orderId, HttpServletRequest request) {
        String uid = request.getHeader("XP-Uid");
        VehicleTemperatureDto vehicleTemperatureDto = xpVehicleService.queryTemperatureByOrderId(orderId, uid);
        VehicleStateVo hvacInnerTemp = vehicleTemperatureDto.getStateMap().get("hvacInnerTemp");
        if(null == hvacInnerTemp){
            return R.fail("查询车内温度失败");
        }
        return R.ok(hvacInnerTemp.getValue());
//        VehicleTemperatureDto vehicleTemperatureDto = xpVehicleService.queryTemperatureByOrderId(orderId, uid);
//        VehicleStateVo hvacInnerTemp = vehicleTemperatureDto.getStateMap().get("hvacInnerTemp");
//        if(null == hvacInnerTemp){
//            return R.fail("查询车内温度失败");
//        }
//        return R.ok(hvacInnerTemp.getValue());
        return R.ok("35.0");
    }