From 6bf9aca909fcfc42778f29e4be0d69abbf64d928 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 八月 2024 14:47:35 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 011fff5..ff3ca40 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());
@@ -156,11 +156,23 @@
@ResponseBody
- @PostMapping("/getSiteList")
+ @PostMapping("/addSite")
@ApiOperation(value = "添加站点", tags = {"管理后台-站点管理"})
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")
@@ -170,12 +182,12 @@
}
@ResponseBody
- @DeleteMapping("/delSite/{id}")
+ @DeleteMapping("/delSite")
@ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
- public AjaxResult delSite(@PathVariable Integer[] id){
+ public AjaxResult delSite(@RequestParam("id") Integer[] id){
return siteService.delSite(id);
}
--
Gitblit v1.7.1