From 6da2f3adffb1fe88454b179c66a66ded8d89e5bc Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 6 Jun 2023 09:01:10 +0800
Subject: [PATCH] update

---
 .../web/controller/pile/PileStationInfoController.java   | 9 +++++++--
 .../pile/service/IStationSettingRelationService.java     | 3 ++-
 .../service/impl/StationSettingRelationServiceImpl.java  | 3 ++-
 3 files changed, 11 insertions(+), 4 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 b52e54d4e..79dbe12a2 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
@@ -12,11 +12,13 @@ import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.pile.domain.PileStationInfo;
+import com.jsowell.pile.domain.StationSettingRelation;
 import com.jsowell.pile.domain.ThirdPartySettingInfo;
 import com.jsowell.pile.dto.FastCreateStationDTO;
 import com.jsowell.pile.dto.LianLianPushStationInfoDTO;
 import com.jsowell.pile.dto.QueryStationDTO;
 import com.jsowell.pile.service.IPileStationInfoService;
+import com.jsowell.pile.service.IStationSettingRelationService;
 import com.jsowell.pile.service.IThirdPartySettingInfoService;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.service.PileService;
@@ -49,6 +51,9 @@ public class PileStationInfoController extends BaseController {
 	@Autowired
 	private LianLianService lianLianService;
 
+	@Autowired
+	private IStationSettingRelationService stationSettingRelationService;
+
 
 	/**
 	 * 查询充电站信息列表NEW
@@ -196,8 +201,8 @@ public class PileStationInfoController extends BaseController {
 	 */
 	@PreAuthorize("@ss.hasPermi('pile:station:query')")
 	@PostMapping("/getSettingInfo")
-	public AjaxResult getSettingInfo(@RequestBody ThirdPartySettingInfo info) {
-		return AjaxResult.success(thirdPartySettingInfoService.selectSettingInfo(info));
+	public AjaxResult getSettingInfo(@RequestBody StationSettingRelation info) {
+		return AjaxResult.success(stationSettingRelationService.selectRelationInfo(info));
 	}
 
 	/**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IStationSettingRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IStationSettingRelationService.java
index be1bae0db..ec815ebf7 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IStationSettingRelationService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IStationSettingRelationService.java
@@ -3,6 +3,7 @@ package com.jsowell.pile.service;
 import java.util.List;
 
 import com.jsowell.pile.domain.StationSettingRelation;
+import com.jsowell.pile.vo.base.StationSettingRelationVO;
 
 /**
  * 站点、第三方推送平台配置对应Service接口
@@ -32,7 +33,7 @@ public interface IStationSettingRelationService {
      * @param stationSettingRelation
      * @return
      */
-    StationSettingRelation selectRelationInfo(StationSettingRelation stationSettingRelation);
+    StationSettingRelationVO selectRelationInfo(StationSettingRelation stationSettingRelation);
 
     /**
      * 新增站点、第三方推送平台配置对应
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSettingRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSettingRelationServiceImpl.java
index 357618dd7..47720c896 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSettingRelationServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSettingRelationServiceImpl.java
@@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl;
 import java.util.List;
 
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.pile.vo.base.StationSettingRelationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.jsowell.pile.mapper.StationSettingRelationMapper;
@@ -48,7 +49,7 @@ public class StationSettingRelationServiceImpl implements IStationSettingRelatio
      * @return
      */
     @Override
-    public StationSettingRelation selectRelationInfo(StationSettingRelation stationSettingRelation) {
+    public StationSettingRelationVO selectRelationInfo(StationSettingRelation stationSettingRelation) {
         return stationSettingRelationMapper.selectRelationInfo(stationSettingRelation);
     }