From c44e660304d6599d90e23da0e52f2c734a81c2ec Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 18:00:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
index 4a8dd0e..15cf0c5 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java
@@ -13,6 +13,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * @author zhibing.pu
  * @Date 2024/8/7 19:54
@@ -26,7 +28,8 @@
 	 * @return
 	 */
 	PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList);
-	
+	PageInfo<GetSiteListDTO> getSiteList1(Long userId);
+
 	
 	/**
 	 * 添加站点信息
@@ -65,7 +68,7 @@
 	 * @return
 	 */
 	
-	PageInfo<SiteVO> pageList(SiteQuery query);
+	PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin);
 
 	/**
 	 * 获取站点详情
@@ -73,4 +76,24 @@
 	 * @return
 	 */
 	SiteDetailVO getDetailById(Integer siteId);
+
+	/**
+	 * 获取站点列表不分页 管理后台-停车场绑定
+	 * @return
+	 */
+	List<Site> getSiteListParkLot();
+
+
+	/**
+	 * 获取站点列表不分页接口信息使用
+	 * @return
+	 */
+	List<Site> getSiteListGun();
+
+	/**
+	 * 获取站点列表
+	 * @param query
+	 * @return
+	 */
+	List<SiteVO> getMapSiteList(SiteQuery query);
 }

--
Gitblit v1.7.1