From 2f226b5b2d80be1eba34d3c641b7cc08be0c322c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 09 八月 2024 10:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 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 1bf5768..a6334e3 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
@@ -1,11 +1,22 @@
package com.ruoyi.chargingPile.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
+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.SiteVO;
import com.ruoyi.chargingPile.service.ISiteService;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.web.page.PageInfo;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @author zhibing.pu
@@ -17,10 +28,67 @@
@Resource
private ISiteService siteService;
+
+
+ @ResponseBody
+ @GetMapping("/getSiteList")
+ @ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
+ public AjaxResult<PageInfo<GetSiteListDTO>> getSiteList(@RequestBody GetSiteList siteList){
+ PageInfo<GetSiteListDTO> list = siteService.getSiteList(siteList);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation(value = "获取站点分页列表", tags = {"小程序-站点管理"})
+ @PostMapping("/pageList")
+ public AjaxResult<PageInfo<SiteVO>> pageList(@Validated @RequestBody SiteQuery query){
+ return AjaxResult.success(siteService.pageList(query));
+ }
+
+
+ @ResponseBody
+ @PostMapping("/getSiteList")
+ @ApiOperation(value = "添加站点", tags = {"管理后台-站点管理"})
+ public AjaxResult addSite(@RequestBody Site site){
+ return siteService.addSite(site);
+ }
+
+ @ResponseBody
+ @PostMapping("/editSite")
+ @ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
+ public AjaxResult editSite(@RequestBody Site site){
+ return siteService.editSite(site);
+ }
+
+ @ResponseBody
+ @DeleteMapping("/delSite/{id}")
+ @ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
+ })
+ public AjaxResult delSite(@PathVariable Integer id){
+ return siteService.delSite(id);
+ }
+ @ResponseBody
+ @PostMapping("/setAccountingStrategy/{id}")
+ @ApiOperation(value = "设置站点计费策略", tags = {"管理后台-站点管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(value = "计费策略id", name = "accountingStrategyId", dataTypeClass = Integer.class, required = true)
+ })
+ public AjaxResult setAccountingStrategy(@PathVariable("id") Integer id, @RequestParam("accountingStrategyId") Integer accountingStrategyId){
+ siteService.setAccountingStrategy(id, accountingStrategyId);
+ return AjaxResult.success();
+ }
- public AjaxResult<> getSiteList(){
+ @ResponseBody
+ @GetMapping("/getAllSiteList")
+ @ApiOperation(value = "获取所有站点数据", tags = {"管理后台-充电桩信息"})
+ public AjaxResult<List<Site>> getAllSiteList(){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0)
+ .orderByDesc(Site::getCreateTime));
+ return AjaxResult.success(list);
}
}
--
Gitblit v1.7.1