sen
2025-10-16 f3a33392a04c30ec58282e3ff68ae58fc5b7a971
Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
3个文件已修改
12 ■■■■ 已修改文件
admin/config/test/application-custom.yml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/src/main/java/com/ruoyi/cwgl/service/impl/VehicleDataApiClient.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/config/test/application-custom.yml
@@ -94,10 +94,10 @@
  # 车辆每日数据API配置
  vehicle-api:
    # API基础地址
    baseUrl: https://api-dev.scania-cn.com/vehicleData
    baseUrl: https://api.scania-cn.com/vehicleData
    # API认证信息
    appid: your_app_id_here
    secret: your_app_secret_here
    appid: 0f4c9b15b6addc6f508e8944e046fa67
    secret: MGY0YzliMTViNmFkZGM2ZjUwOGU4OTQ0ZTA0NmZhNjc=
    # 接口超时设置(毫秒)
    timeout: 30000
    # 重试次数
quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java
@@ -47,7 +47,7 @@
            // 直接使用注入的API客户端调用方法
            ApiResponse<List<VehicleDailyData>> response = vehicleDataApiClient.getDailyVehicleData(dateStr);
            
            if (response != null && response.getCode() == 0 && CollectionUtil.isNotEmpty(response.getData())) {
            if (response != null && response.getCode().equals(200)  && CollectionUtil.isNotEmpty(response.getData())) {
                List<VehicleDailyData> vehicleDataList = response.getData();
                logger.info("成功获取到{}条车辆数据", vehicleDataList.size());
                
@@ -88,7 +88,7 @@
            // 直接使用注入的API客户端调用方法
            ApiResponse<List<VehicleDailyData>> response = vehicleDataApiClient.getDailyVehicleData(date);
            
            if (response != null && response.getCode() == 0 && CollectionUtil.isNotEmpty(response.getData())) {
            if (response != null && response.getCode().equals(200) && CollectionUtil.isNotEmpty(response.getData())) {
                List<VehicleDailyData> vehicleDataList = response.getData();
                logger.info("成功获取到{}条车辆数据", vehicleDataList.size());
                
service/src/main/java/com/ruoyi/cwgl/service/impl/VehicleDataApiClient.java
@@ -77,7 +77,7 @@
            if (response.isOk()) {
                String body = response.body();
                logger.debug("响应内容: {}", body);
                logger.info("响应内容: {}", body);
                // 解析JSON响应
                return parseResponse(body);