From c6e38b6c66de5f5a8df5b8b2ab03a82c3b605db8 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期三, 03 十二月 2025 00:48:44 +0800
Subject: [PATCH] feat:优化同步
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 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 c5abe54..1694256 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;
@@ -67,27 +68,61 @@
List<String> onlyCms=cmsPlateNos.stream().filter(e->!notCmsVehicles.contains(e)).collect((Collectors.toList()));
Integer syncCarCount=0;
- response.getDevices().stream().filter(e->onlyCms.contains(this.getPlateNo(e.getVid()))).forEach(vehicle->{
- String plateNo =this.getPlateNo(vehicle.getVid());
-
- VehicleInfo vehicleInfo= vehicleInfoService.selectVehicleInfoByPlateNumber(plateNo);
- if (vehicleInfo==null) {
- vehicleInfo = new VehicleInfo();
- vehicleInfo.setVehicleNo(plateNo);
- vehicleInfo.setDeviceId(vehicle.getDid());
- vehicleInfo.setPlatformCode("CMS");
- vehicleInfo.setStatus("0");
- vehicleInfoService.insertVehicleInfo(vehicleInfo);
+ for (CmsVehicleDeviceListResponse.CmsVehicleDevice vehicle : response.getDevices()) {
+ try {
+ if (!onlyCms.contains(this.getPlateNo(vehicle.getVid()))) {
+ continue;
+ }
+
+ String plateNo = this.getPlateNo(vehicle.getVid());
+
+ // 浣跨敤閲嶈瘯鏈哄埗澶勭悊姝婚攣
+ int maxRetries = 3;
+ int retryCount = 0;
+ boolean success = false;
+
+ while (!success && retryCount < maxRetries) {
+ try {
+ // 鏌ヨ杞﹁締淇℃伅锛堜娇鐢ㄧ簿纭尮閰嶏級
+ VehicleInfo vehicleInfo = vehicleInfoService.selectVehicleInfoByPlateNumber(plateNo);
+ if (vehicleInfo == null) {
+ // 鏂板杞﹁締
+ vehicleInfo = new VehicleInfo();
+ vehicleInfo.setVehicleNo(plateNo);
+ vehicleInfo.setDeviceId(vehicle.getDid());
+ vehicleInfo.setPlatformCode("CMS");
+ vehicleInfo.setStatus("0");
+ vehicleInfoService.insertVehicleInfo(vehicleInfo);
+ syncCarCount++;
+ log.info("鏂板CMS杞﹁締: {}", plateNo);
+ } else {
+ // 鏇存柊杞﹁締 - 浠呮洿鏂板繀瑕佸瓧娈�,閬垮厤瑙﹀彂鍏宠仈琛ㄦ搷浣�
+ vehicleInfo.setDeviceId(vehicle.getDid());
+ vehicleInfo.setPlatformCode("CMS");
+ vehicleInfo.setStatus("0");
+ vehicleInfo.setDeptIds(null); // 涓嶆洿鏂伴儴闂ㄥ叧鑱�,閬垮厤姝婚攣
+ vehicleInfoService.updateVehicleInfo(vehicleInfo);
+ syncCarCount++;
+ log.debug("鏇存柊CMS杞﹁締: {}", plateNo);
+ }
+ success = true;
+ } catch (org.springframework.dao.DeadlockLoserDataAccessException e) {
+ retryCount++;
+ if (retryCount < maxRetries) {
+ log.warn("鍚屾杞﹁締 {} 閬囧埌姝婚攣,绗瑊}娆￠噸璇�", plateNo, retryCount);
+ // 闅忔満绛夊緟50-200ms鍚庨噸璇�,閬垮厤澶氫釜绾跨▼鍚屾椂閲嶈瘯
+ Thread.sleep(50 + (long)(Math.random() * 150));
+ } else {
+ log.error("鍚屾杞﹁締 {} 澶辫触: 姝婚攣閲嶈瘯{}娆″悗浠嶅け璐�", plateNo, maxRetries);
+ throw e;
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("鍚屾杞﹁締 {} 澶辫触: {}", vehicle.getVid(), e.getMessage());
+ // 缁х画澶勭悊涓嬩竴涓溅杈�
}
- else{
- vehicleInfo.setVehicleNo(plateNo);
- vehicleInfo.setDeviceId(vehicle.getDid());
- vehicleInfo.setPlatformCode("CMS");
- vehicleInfo.setStatus("0");
- vehicleInfoService.updateVehicleInfo(vehicleInfo);
- }
-
- });
+ }
@@ -101,6 +136,7 @@
//瀵硅溅鐗屽鐞嗙殑閫氱敤鏂规硶
private String getPlateNo(String plateNo){
+
if (StringUtils.isNotEmpty(plateNo)) {
// 浠庤溅杈嗗悕绉颁腑鎻愬彇杞︾墝鍙凤紙鍋囪鏍煎紡涓�"鈽呰溅鐗屽彿锛堝湴鍖猴級"锛�
if(plateNo.contains("(")) {
@@ -109,7 +145,9 @@
plateNo = plateNo.replace("鈽�", "").replace("鈽�", "").split("锛�")[0];
}
}
- return plateNo;
+ //xxx绮SX120
+ plateNo = plateNo.replaceAll("[^a-zA-Z0-9]", "");
+ return PlateNumberExtractor.extractPlateNumber(plateNo);
}
/**
--
Gitblit v1.9.1