From 5ec98728a942b2660d78bb0e5c82762e132c4c83 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 09 八月 2024 11:32:02 +0800 Subject: [PATCH] 操作日志 --- ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 29 ++++++++++++++++++++++------- 1 files changed, 22 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..e09a570 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 @@ -14,6 +14,9 @@ import com.ruoyi.chargingPile.service.TAccountingStrategyService; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.log.enums.OperatorType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -55,12 +58,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 +71,23 @@ /** * 添加计费策略管理 */ - @ApiOperation(tags = {"后台-计费策略"},value = "添加计费策略") + @Log(title = "添加计费策略", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE) + @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 = "修改计费策略") + @Log(title = "修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE) + @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TAccountingStrategyDTO dto) { // 删除计费策略明细信息 @@ -97,7 +103,7 @@ /** * 查看计费策略详情 */ - @ApiOperation(tags = {"后台-计费策略"},value = "查看计费策略详情") + @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情") @GetMapping(value = "/getDetailById") public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam Integer id) { return AjaxResult.ok(accountingStrategyService.getById(id)); @@ -106,6 +112,7 @@ /** * 删除计费策略 */ + @Log(title = "删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam Integer id) { @@ -118,6 +125,7 @@ /** * 批量删除计费策略 */ + @Log(title = "批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE) @ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略") @DeleteMapping(value = "/deleteByIds") public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) { @@ -127,5 +135,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