From 365af808539413d618747e8e1fb6ed35d153064d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 09 八月 2024 11:26:01 +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/controller/SiteController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 6bb56a7..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,5 +1,6 @@
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;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @author zhibing.pu
@@ -59,7 +61,7 @@
@ResponseBody
@DeleteMapping("/delSite/{id}")
- @ApiOperation(value = "编辑站点", tags = {"管理后台-站点管理"})
+ @ApiOperation(value = "删除站点", tags = {"管理后台-站点管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "站点id", name = "id", dataTypeClass = Integer.class, required = true)
})
@@ -68,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