From 09faa36132c8cbada5327649875534ef01c1a3b1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 11 十二月 2025 20:44:31 +0800
Subject: [PATCH] feat: 优化任务里程统计
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java
index b55780a..b006eb5 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import com.ruoyi.common.utils.PlateNumberExtractor;
import com.ruoyi.system.domain.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +37,7 @@
private IVehicleGpsService vehicleGpsService;
public void syncVehicleInfo() {
- log.info("寮�濮嬪悓姝MS杞﹁締淇℃伅");
+// log.info("寮�濮嬪悓姝MS杞﹁締淇℃伅");
try {
// 鑾峰彇CMS鎵�鏈夎溅杈嗕俊鎭�
CmsVehicleDeviceListResponse response = cmsGpsCollectService.getDeviceByVehicle(null);
@@ -93,7 +94,7 @@
vehicleInfo.setStatus("0");
vehicleInfoService.insertVehicleInfo(vehicleInfo);
syncCarCount++;
- log.info("鏂板CMS杞﹁締: {}", plateNo);
+// log.info("鏂板CMS杞﹁締: {}", plateNo);
} else {
// 鏇存柊杞﹁締 - 浠呮洿鏂板繀瑕佸瓧娈�,閬垮厤瑙﹀彂鍏宠仈琛ㄦ搷浣�
vehicleInfo.setDeviceId(vehicle.getDid());
@@ -102,7 +103,7 @@
vehicleInfo.setDeptIds(null); // 涓嶆洿鏂伴儴闂ㄥ叧鑱�,閬垮厤姝婚攣
vehicleInfoService.updateVehicleInfo(vehicleInfo);
syncCarCount++;
- log.debug("鏇存柊CMS杞﹁締: {}", plateNo);
+// log.debug("鏇存柊CMS杞﹁締: {}", plateNo);
}
success = true;
} catch (org.springframework.dao.DeadlockLoserDataAccessException e) {
@@ -126,8 +127,8 @@
- log.info("鎴愬姛鍚屾{}涓狢MS杞﹁締淇℃伅", syncCarCount);
- log.info("CMS杞﹁締淇℃伅鍚屾瀹屾垚");
+// log.info("鎴愬姛鍚屾{}涓狢MS杞﹁締淇℃伅", syncCarCount);
+// log.info("CMS杞﹁締淇℃伅鍚屾瀹屾垚");
} catch (Exception e) {
log.error("鍚屾CMS杞﹁締淇℃伅寮傚父", e);
}
@@ -135,6 +136,7 @@
//瀵硅溅鐗屽鐞嗙殑閫氱敤鏂规硶
private String getPlateNo(String plateNo){
+
if (StringUtils.isNotEmpty(plateNo)) {
// 浠庤溅杈嗗悕绉颁腑鎻愬彇杞︾墝鍙凤紙鍋囪鏍煎紡涓�"鈽呰溅鐗屽彿锛堝湴鍖猴級"锛�
if(plateNo.contains("(")) {
@@ -143,14 +145,16 @@
plateNo = plateNo.replace("鈽�", "").replace("鈽�", "").split("锛�")[0];
}
}
- return plateNo;
+ //xxx绮SX120
+ plateNo = plateNo.replaceAll("[^a-zA-Z0-9]", "");
+ return PlateNumberExtractor.extractPlateNumber(plateNo);
}
/**
* 鍚屾CMS杞﹁締浣嶇疆淇℃伅
*/
public void syncVehicleLocation() {
- log.info("寮�濮嬪悓姝MS杞﹁締浣嶇疆淇℃伅");
+// log.info("寮�濮嬪悓姝MS杞﹁締浣嶇疆淇℃伅");
try {
//鍏堣幏寰楁湰鍦癈MS涓婄殑鎵�鏈塁MS杞﹁締
VehicleInfo query = new VehicleInfo();
--
Gitblit v1.9.1