From f3a33392a04c30ec58282e3ff68ae58fc5b7a971 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 16 十月 2025 17:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
admin/config/test/application-custom.yml | 6 +++---
quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java | 4 ++--
service/src/main/java/com/ruoyi/cwgl/service/impl/VehicleDataApiClient.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/config/test/application-custom.yml b/admin/config/test/application-custom.yml
index 0b19db5..7c48021 100644
--- a/admin/config/test/application-custom.yml
+++ b/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
# 閲嶈瘯娆℃暟
diff --git a/quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java b/quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java
index d7bba27..43d4ab0 100644
--- a/quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java
+++ b/quartz/src/main/java/com/ruoyi/quartz/task/VehicleDataSyncTask.java
@@ -47,7 +47,7 @@
// 鐩存帴浣跨敤娉ㄥ叆鐨凙PI瀹㈡埛绔皟鐢ㄦ柟娉�
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 @@
// 鐩存帴浣跨敤娉ㄥ叆鐨凙PI瀹㈡埛绔皟鐢ㄦ柟娉�
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());
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/VehicleDataApiClient.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/VehicleDataApiClient.java
index fc2a900..0416494 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/VehicleDataApiClient.java
+++ b/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);
--
Gitblit v1.8.0