From 796e72cbfd5624a218aaec99357d79b206bf3d77 Mon Sep 17 00:00:00 2001
From: lhb <495598773@qq.com>
Date: Tue, 15 Apr 2025 15:05:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=88=97=E8=A1=A8=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E7=BC=96=E8=BE=91=20=E5=A2=9E=E5=8A=A0=20pro?=
 =?UTF-8?q?xyOperaterId=EF=BC=88=E8=BF=90=E8=90=A5=E5=95=86Id=EF=BC=89?=
 =?UTF-8?q?=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/evotech/hd/common/core/entity/cloud/VehicleInfo.java   | 3 +++
 .../com/evotech/hd/cloud/service/impl/VehicleServiceImpl.java  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java
index c6d8fb5..d550271 100644
--- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java
+++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java
@@ -124,4 +124,7 @@ public class VehicleInfo implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date uptime;
+
+    @Schema(description = "运营商Id")
+    private String proxyOperaterId;
 }
diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/VehicleServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/VehicleServiceImpl.java
index a9c354c..e79cebe 100644
--- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/VehicleServiceImpl.java
+++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/VehicleServiceImpl.java
@@ -72,6 +72,7 @@ public class VehicleServiceImpl implements VehicleService {
 				.eq(StringUtils.hasText(plvr.getFrameworkNo()), "framework_no", plvr.getFrameworkNo())
 				.eq(StringUtils.hasText(plvr.getPhone()), "phone", plvr.getPhone())
 				.eq(StringUtils.hasText(plvr.getCcode()), "ccode", plvr.getCcode())
+				.eq(StringUtils.hasText(plvr.getProxyOperaterId()), "proxy_operater_id", plvr.getProxyOperaterId())
 				.ne("del_flag", 1)
 				.orderByAsc("plate_num"));
 		if (page.getRecords().isEmpty()) {