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/TAccountingStrategyController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index ee1cceb..5a00f21 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -55,12 +55,12 @@
/**
* 查询计费策略明细列表
*/
- @ApiOperation(tags = {"后台-计费策略"},value = "查询计费策略明细列表")
+ @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理", "管理后台-充电桩信息"},value = "查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam Integer strategyId) {
List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
list.forEach(detail -> {
- detail.setTotalPrice(detail.getCostServiceCharge().add(detail.getElectrovalence()));
+ detail.setTotalPrice(detail.getElectrovalence().add(detail.getElectrovalence()));
});
return AjaxResult.ok(list);
}
@@ -68,20 +68,21 @@
/**
* 添加计费策略管理
*/
- @ApiOperation(tags = {"后台-计费策略"},value = "添加计费策略")
+ @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "添加计费策略")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TAccountingStrategyDTO dto) {
+ public AjaxResult<Integer> add(@RequestBody TAccountingStrategyDTO dto) {
accountingStrategyService.save(dto);
// 添加明细
dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
+ accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
// TODO 硬件 同步策略到充电桩
- return AjaxResult.ok(accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails()));
+ return AjaxResult.ok(dto.getId());
}
/**
* 修改计费策略
*/
- @ApiOperation(tags = {"后台-计费策略"},value = "修改计费策略")
+ @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
public AjaxResult<Boolean> update(@RequestBody TAccountingStrategyDTO dto) {
// 删除计费策略明细信息
@@ -97,7 +98,7 @@
/**
* 查看计费策略详情
*/
- @ApiOperation(tags = {"后台-计费策略"},value = "查看计费策略详情")
+ @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情")
@GetMapping(value = "/getDetailById")
public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam Integer id) {
return AjaxResult.ok(accountingStrategyService.getById(id));
@@ -127,5 +128,12 @@
return AjaxResult.ok(accountingStrategyService.removeByIds(ids));
}
+
+ @ApiOperation(tags = {"管理后台-站点管理"},value = "获取平台添加的计费策略")
+ @DeleteMapping(value = "/getPlatformAccountingStrategy")
+ public AjaxResult<List<TAccountingStrategyVO>> getPlatformAccountingStrategy(){
+ List<TAccountingStrategyVO> list = accountingStrategyService.getPlatformAccountingStrategy();
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.7.1