From 6b79e22056bcc2c14d3e20802174b89bc2a0a204 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 09 八月 2024 10:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/SiteController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 5d7f589..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,17 +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 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
@@ -23,8 +28,8 @@
@Resource
private ISiteService siteService;
-
-
+
+
@ResponseBody
@GetMapping("/getSiteList")
@ApiOperation(value = "获取站点列表", tags = {"管理后台-站点管理"})
@@ -32,7 +37,13 @@
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")
@@ -50,7 +61,7 @@
@ResponseBody
@DeleteMapping("/delSite/{id}")
- @ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
+ @ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
@@ -59,7 +70,25 @@
}
+ @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();
+ }
-
+ @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