From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 10 九月 2024 13:01:44 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/ISiteService.java | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 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..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 @@ -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 @@ -25,7 +28,8 @@ * @return */ PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList); - + PageInfo<GetSiteListDTO> getSiteList1(Long userId); + /** * 添加站点信息 @@ -48,7 +52,7 @@ * @param id * @return */ - AjaxResult delSite(Integer id); + AjaxResult delSite(Integer[] id); /** @@ -57,7 +61,39 @@ * @param accountingStrategyId 计费策略id */ void setAccountingStrategy(Integer id, Integer accountingStrategyId); + + /** + * 获取站点分页列表 + * @param query + * @return + */ - - PageInfo<SiteVO> pageList(SiteQuery query); + PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin); + + /** + * 获取站点详情 + * @param siteId + * @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