From 97db9d11ff425583d2dece82a842a7766bb5e7e4 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 26 九月 2025 21:43:39 +0800
Subject: [PATCH] feat: 添加map
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
index f966940..5c3e134 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -139,6 +139,8 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String beginTime= sdf.format(dispatchOrd.getDispatchOrdStartDate());
String endTime= sdf.format(new Date());
+
+ logger.info("鏌ヨ杞﹁締杞ㄨ抗锛氳溅杈嗗彿锛歿}, 寮�濮嬫椂闂达細{}, 缁撴潫鏃堕棿锛歿}", vehicleNo, beginTime, endTime);
return this.getAnonymousTracks(vehicleNo,beginTime,endTime);
//
// vehicleGps.setVehicleNo(tbVehicleOrder.getVehicle());
@@ -225,17 +227,20 @@
// 閫氳繃杞︾墝鍙疯幏鍙栬澶嘔D
VehicleInfo vehicleInfo = vehicleInfoService.selectVehicleInfoByPlateNumber(vehicleNo);
if (vehicleInfo == null) {
- throw new Error("鏈壘鍒拌杞﹁締瀵瑰簲鐨凣PS璁惧");
+
+ // throw new Error("鏈壘鍒拌杞﹁締瀵瑰簲鐨凣PS璁惧");
+ return getDataTable(new ArrayList<>());
}
// 澶勭悊寮�濮嬫椂闂�
- beginTime = beginTime.replace("T", " ").replace(" ","%20");
+ beginTime = beginTime.replace("T", " ");
if (beginTime.split(":").length == 2) { // 鍙湁灏忔椂鍜屽垎閽�
beginTime += ":00";
}
// 澶勭悊缁撴潫鏃堕棿
- endTime = endTime.replace("T", " ").replace(" ","%20");
+// endTime = endTime.replace("T", " ").replace(" ","%20");
+ endTime = endTime.replace("T", " ");
if (endTime.split(":").length == 2) { // 鍙湁灏忔椂鍜屽垎閽�
endTime += ":59";
}
@@ -310,10 +315,12 @@
request.setEndtime(endTime);
request.setTimezone(8); // 涓浗鏃跺尯
+ logger.info("鏌ヨ杞﹁締杞ㄨ抗锛氳溅杈嗗彿锛歿}, 璁惧ID锛歿}, 寮�濮嬫椂闂达細{}, 缁撴潫鏃堕棿锛歿}", vehicleNo, vehicleInfo.getDeviceId(), beginTime, endTime);
// 鏌ヨ杞ㄨ抗
GpsTrackQueryResponse response = gpsCollectService.queryTracks(request);
if (response.getStatus() != 0) {
- throw new Error("鏌ヨ杞ㄨ抗澶辫触锛�" + response.getCause());
+ logger.error("鏌ヨ杞ㄨ抗澶辫触锛岀姸鎬佺爜锛歿}, 閿欒淇℃伅锛歿}", response.getStatus(), response.getCause());
+ throw new Error("鏌ヨ杞ㄨ抗澶辫触锛�" + (response.getCause() != null ? response.getCause() : "鏈煡閿欒"));
}
// 杞崲GPS51杞ㄨ抗鐐逛负缁熶竴鏍煎紡
--
Gitblit v1.9.1