From 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 09:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
index b16027a..34a893d 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java
@@ -109,7 +109,7 @@
return AjaxResult.success(siteService.list(new QueryWrapper<>()));
}
- @PostMapping("/getSiteListGun")
+ @GetMapping("/getSiteListGun")
@ApiOperation(value = "获取站点列表 不分页", tags = {"管理后台-接口信息使用"})
public AjaxResult<List<Site>> getSiteListGun(){
return AjaxResult.success(siteService.getSiteListGun());
@@ -124,6 +124,12 @@
@PostMapping("/pageList")
public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
return AjaxResult.success(siteService.pageList(query));
+ }
+
+ @ApiOperation(value = "获取站点列表", tags = {"小程序-站点管理-地图导航站点"})
+ @PostMapping("/getMapSiteList")
+ public AjaxResult<List<SiteVO>> getMapSiteList(@Validated @RequestBody SiteQuery query){
+ return AjaxResult.success(siteService.getMapSiteList(query));
}
@ApiOperation(value = "获取站点详细信息", tags = {"小程序-站点管理-站点详情"})
@PostMapping("/getDetailById")
@@ -161,6 +167,18 @@
public AjaxResult addSite(@RequestBody Site site){
return siteService.addSite(site);
}
+
+
+
+ @ResponseBody
+ @PostMapping("/getSiteInfo/{id}")
+ @ApiOperation(value = "获取站点详情", tags = {"管理后台-站点管理"})
+ public AjaxResult<Site> getSiteInfo(@PathVariable Integer id){
+ Site site = siteService.getById(id);
+ return AjaxResult.success(site);
+ }
+
+
@ResponseBody
@PostMapping("/editSite")
@@ -231,4 +249,16 @@
List<Site> sites = siteService.listByIds(ids);
return R.ok(sites);
}
+
+
+ /**
+ * 获取所有站点数据
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getSiteAll")
+ public R<List<Site>> getSiteAll(){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1