From 2841e102ea4b5e9ddd40327829431a25a9122cd9 Mon Sep 17 00:00:00 2001
From: wanglizhong <wlz>
Date: 星期日, 04 五月 2025 17:20:28 +0800
Subject: [PATCH] fix:增加cms同步
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java
index 8c7c1ee..70b8789 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java
@@ -99,12 +99,16 @@
VehicleInfo vehicleInfo = vehicleInfoService.selectVehicleInfoByPlateNumber(plateNumber);
if (vehicleInfo != null) {
vehicleInfo.setDeviceId(deviceId);
+ //鑾峰緱鏁版嵁瀛楀吀涓殑骞冲彴缂栫爜
+
+ vehicleInfo.setPlatformCode("GPS51");
vehicleInfoService.updateVehicleInfo(vehicleInfo);
} else {
VehicleInfo newVehicle = new VehicleInfo();
newVehicle.setVehicleNo(plateNumber);
newVehicle.setDeviceId(deviceId);
newVehicle.setStatus("0");
+ newVehicle.setPlatformCode("GPS51");
vehicleInfoService.insertVehicleInfo(newVehicle);
}
}
@@ -142,21 +146,39 @@
//devicetime 杩欎釜鏄竴涓猯inux鏃堕棿鎴筹紝瑕佽浆鎹㈡垚鍖椾含鏃堕棿锛屽啀杞垚yyyy-MM-dd HH:mm:ss鏍煎紡
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+
+ //getArrivedtime 杩欎釜鏄竴涓猯inux鏃堕棿鎴筹紝瑕佽浆鎹㈡垚鍖椾含鏃堕棿锛屽啀杞垚yyyy-MM-dd HH:mm:ss鏍煎紡
+ long arrivedTime = position.getArrivedtime();
+ Date arrivedDate;
+ // 妫�鏌ユ椂闂存埑鏄惁鏈夋晥锛堝ぇ浜�0锛�
+ if (arrivedTime > 0) {
+ arrivedDate = new Date(arrivedTime);
+ // 鍑忓幓8灏忔椂
+ arrivedDate.setTime(arrivedDate.getTime() - 8 * 60 * 60 * 1000);
+ } else {
+ // 鏃堕棿鎴虫棤鏁堬紝浣跨敤褰撳墠鏃堕棿
+ arrivedDate = new Date();
+ }
+ gps.setPlatformProcessTime(sdf.format(arrivedDate));
+
// 璁惧涓婃姤鏃堕棿
long deviceTime = position.getDevicetime();
- if (deviceTime > 0 && deviceTime < 4102444800L) { // 2100-01-01 00:00:00
- gps.setDeviceReportTime(sdf.format(new Date(deviceTime * 1000L)));
+ Date date;
+ // 妫�鏌ユ椂闂存埑鏄惁鏈夋晥锛堝ぇ浜�0锛�
+ if (deviceTime > 0) {
+ date = new Date(deviceTime);
+ // 鍑忓幓8灏忔椂
+ date.setTime(date.getTime() - 8 * 60 * 60 * 1000);
} else {
- log.warn("杞﹁締[{}]鐨勮澶囨椂闂存埑[{}]鏃犳晥锛屼娇鐢ㄥ綋鍓嶆椂闂�", vehicle.getVehicleNo(), deviceTime);
- gps.setDeviceReportTime(sdf.format(new Date()));
+ // 鏃堕棿鎴虫棤鏁堬紝浣跨敤褰撳墠鏃堕棿
+ date = arrivedDate;
}
-
- // 骞冲彴澶勭悊鏃堕棿锛堝綋鍓嶆椂闂达級
- gps.setPlatformProcessTime(sdf.format(new Date()));
+ gps.setDeviceReportTime(sdf.format(date));
+
+
// 閲囬泦鏃堕棿锛堜娇鐢ㄨ澶囦笂鎶ユ椂闂达級
- gps.setCollectTime(gps.getDeviceReportTime());
+ gps.setCollectTime(sdf.format(new Date( )));
// 淇濆瓨GPS浣嶇疆淇℃伅
vehicleGpsService.insertVehicleGps(gps);
--
Gitblit v1.9.1