From 3fc5a3273ff69688c0ba6d81ca68f3065e982a52 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 4 Dec 2025 15:32:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=BD=92=E5=B1=9E=E6=96=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/PileStationInfoController.java       |  8 ------
 .../domain/ThirdPartyStationRelation.java     |  5 ++++
 .../ThirdPartyStationRelationService.java     |  5 ++++
 .../vo/base/ThirdPartyStationRelationVO.java  | 25 ++++++++++++++++++-
 .../pile/ThirdPartyStationRelationMapper.xml  |  1 +
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
index 474cef698..6740cccf8 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
@@ -21,14 +21,12 @@ import com.jsowell.pile.dto.amap.EditAmapFlagDTO;
 import com.jsowell.pile.dto.lutongyunting.BindParkingPlatformDTO;
 import com.jsowell.pile.service.PileStationInfoService;
 import com.jsowell.pile.service.ThirdPartyParkingConfigService;
-import com.jsowell.pile.service.ThirdPartySettingInfoService;
 import com.jsowell.pile.service.ThirdPartyStationRelationService;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.pile.vo.web.StationSelectVO;
 import com.jsowell.service.PileService;
 import com.jsowell.thirdparty.amap.service.AMapService;
-import com.jsowell.thirdparty.common.CommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -51,12 +49,6 @@ public class PileStationInfoController extends BaseController {
     @Autowired
     private PileService pileService;
 
-    @Autowired
-    private ThirdPartySettingInfoService thirdPartySettingInfoService;
-
-    @Autowired
-    private CommonService commonService;
-
     @Autowired
     private AMapService aMapService;
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java
index acb844e7f..decc72d3b 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ThirdPartyStationRelation.java
@@ -39,6 +39,11 @@ public class ThirdPartyStationRelation extends BaseEntity {
     @Excel(name = "三方配置类型")
     private String thirdPartyType;
 
+    /**
+     * 设备归属方id
+     */
+    private String equipmentOwnerId;
+
     /**
      * 启动方式（1-我方启动）
      */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java
index d914c0b4e..d4cb5236e 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java
@@ -113,5 +113,10 @@ public interface ThirdPartyStationRelationService {
      */
     List<StationInfoVO> selectStationList(String thirdPlatformType);
 
+    /**
+     * 根据站点id查询该站点对接了哪些第三方平台
+     * @param stationId
+     * @return
+     */
     List<ThirdPartyStationRelationVO> getRelationInfoListV2(String stationId);
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java
index e260109ef..15682be50 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ThirdPartyStationRelationVO.java
@@ -10,22 +10,45 @@ import lombok.Data;
  */
 @Data
 public class ThirdPartyStationRelationVO {
+    /**
+     * 站点id
+     */
     private String stationId;
 
+    /**
+     * 第三方平台类型
+     */
     private String thirdPartyType;
 
+    /**
+     * 第三方平台名称
+     */
     private String thirdPartyName;
 
+    /**
+     * 设备所属商户id
+     */
+    private String equipmentOwnerId;
+
+    /**
+     * 启动模式
+     */
     private String startMode;
 
+    /**
+     * url地址
+     */
     private String urlAddress;
+
+    /**
+     * 密钥信息
+     */
     private String operatorId;
     private String operatorSecret;
     private String signSecret;
     private String dataSecret;
     private String dataSecretIv;
 
-
     /**
      * 对方平台密钥信息
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
index 2f13c7ad3..46e19e044 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ThirdPartyStationRelationMapper.xml
@@ -336,6 +336,7 @@
         SELECT
             t1.station_id AS stationId,
             t1.third_party_type AS thirdPartyType,
+            t1.equipment_owner_id as equipmentOwnerId,
             t2.platform_name AS thirdPartyName,
             t2.start_mode AS startMode,
             t2.url_prefix AS urlAddress,