From 490db2e9cc769bd0aa3571fad345c7a01bc01bdd Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 22 八月 2024 09:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 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 722b578..4145a21 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
@@ -5,12 +5,15 @@
 import com.ruoyi.chargingPile.api.model.Site;
 import com.ruoyi.chargingPile.api.query.GetSiteList;
 import com.ruoyi.chargingPile.api.query.SiteQuery;
+import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
 import com.ruoyi.chargingPile.api.vo.SiteVO;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageInfo;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * @author zhibing.pu
@@ -48,7 +51,7 @@
 	 * @param id
 	 * @return
 	 */
-	AjaxResult delSite(Integer id);
+	AjaxResult delSite(Integer[] id);
 	
 	
 	/**
@@ -57,7 +60,33 @@
 	 * @param accountingStrategyId 计费策略id
 	 */
 	void setAccountingStrategy(Integer id, Integer accountingStrategyId);
-	
+
+	/**
+	 * 获取站点分页列表
+	 * @param query
+	 * @return
+	 */
 	
 	PageInfo<SiteVO> pageList(SiteQuery query);
+
+	/**
+	 * 获取站点详情
+	 * @param siteId
+	 * @return
+	 */
+	SiteDetailVO getDetailById(Integer siteId);
+
+	/**
+	 * 获取站点列表不分页 管理后台-停车场绑定
+	 * @return
+	 */
+	List<Site> getSiteListParkLot();
+
+
+	/**
+	 * 获取站点列表不分页接口信息使用
+	 * @return
+	 */
+	List<Site> getSiteListGun();
+
 }

--
Gitblit v1.7.1