From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 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 c6e22fc..987610b 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
@@ -1,6 +1,8 @@
package com.ruoyi.chargingPile.controller;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
@@ -21,9 +23,12 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.integration.api.feignClient.IntegrationClient;
+import com.ruoyi.integration.api.feignClient.TCECClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.ApiOperation;
@@ -40,6 +45,7 @@
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
import static com.ruoyi.common.core.context.SecurityContextHolder.getUserId;
@@ -62,11 +68,14 @@
private TChargingPileService chargingPileService;
@Autowired
private ISiteService siteService;
- @Autowired
+ @Resource
private SysUserClient sysUserClient;
@Resource
private IntegrationClient integrationClient;
+
+ @Resource
+ private TCECClient tcecClient;
@Autowired
@@ -78,6 +87,8 @@
/**
* 查询计费策略列表
*/
+ @RequiresPermissions(value = {"/site/add", "/site/update", "/site/accounting_strategy", "/chargingPile/add_charging_gun", "/chargingPile/accountingStrategy",
+ "/chargingGun/update", "/accountingStrategy"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-计费策略"},value = "查询计费策略分页列表")
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TAccountingStrategyVO>> pageList(@RequestBody TAccountingStrategyQuery query) {
@@ -87,6 +98,8 @@
/**
* 查询计费策略明细列表
*/
+ @RequiresPermissions(value = {"/billingTemplateAudit/info", "/site/accounting_strategy", "/chargingGun/select_rate", "/accountingStrategy",
+ "/accountingStrategy/select", "/accountingStrategy/update"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理", "管理后台-充电桩信息"},value = "查询计费策略明细列表")
@GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
@@ -119,22 +132,23 @@
Long userId = SecurityUtils.getLoginUser().getUserid();
dto.setUserId(userId);
accountingStrategyService.save(dto);
+ // 添加明细
+ dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
+ accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
if(null != dto.getSiteId()){
//下发硬件数据
List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, dto.getSiteId()).eq(TChargingPile::getDelFlag, 0).list();
for (TChargingPile tChargingPile : list) {
- integrationClient.setupBillingModel1(tChargingPile.getCode());
+ integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(dto.getAccountingStrategyDetails()));
}
}
- // 添加明细
- dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
- accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
return AjaxResult.ok(dto.getId());
}
/**
* 修改计费策略
*/
+ @RequiresPermissions(value = {"/accountingStrategy/update"}, logical = Logical.OR)
@Log(title = "【计费策略】修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
@@ -202,7 +216,7 @@
//下发硬件数据
List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, dto.getSiteId()).eq(TChargingPile::getDelFlag, 0).list();
for (TChargingPile tChargingPile : list) {
- integrationClient.setupBillingModel1(tChargingPile.getCode());
+ integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(dto.getAccountingStrategyDetails()));
}
}
return AjaxResult.success();
@@ -211,6 +225,7 @@
/**
* 查看计费策略详情
*/
+ @RequiresPermissions(value = {"/site/accounting_strategy", "/accountingStrategy/select", "/accountingStrategy/update"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情")
@GetMapping(value = "/getDetailById")
public AjaxResult<TAccountingStrategyVO> getDetailById(@RequestParam("id") Integer id) {
@@ -270,8 +285,9 @@
String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
accountingStrategyVO.setTwoUserName(twoUserName);
}
- if(null != children.getUserId()){
- String userName = sysUserClient.getSysUser(children.getUserId()).getData().getNickName();
+ TAccountingStrategy accountingStrategy1 = accountingStrategyService.getById(id);
+ if(null != accountingStrategy1.getUserId()){
+ String userName = sysUserClient.getSysUser(accountingStrategy1.getUserId()).getData().getNickName();
accountingStrategyVO.setUserName(userName);
}
accountingStrategyVO.setAccountingStrategyDetailList(accountingStrategyDetailService.list(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
@@ -283,6 +299,7 @@
/**
* 删除计费策略
*/
+ @RequiresPermissions(value = {"/accountingStrategy/del"}, logical = Logical.OR)
@Log(title = "【计费策略】删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
@DeleteMapping(value = "/deleteById")
@@ -302,6 +319,7 @@
/**
* 批量删除计费策略
*/
+ @RequiresPermissions(value = {"/accountingStrategy/del"}, logical = Logical.OR)
@Log(title = "【计费策略】批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
@@ -326,9 +344,10 @@
List<TAccountingStrategyVO> list = accountingStrategyService.getPlatformAccountingStrategy();
return AjaxResult.success(list);
}
-
-
-
+
+
+
+ @RequiresPermissions(value = {"/billingTemplateAudit"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "查询计费审核分页列表")
@PostMapping(value = "/auth/pageList")
public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
@@ -336,7 +355,8 @@
return AjaxResult.ok(accountingStrategyService.pageList1(query));
}
-
+
+ @RequiresPermissions(value = {"/billingTemplateAudit/audit"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
@PostMapping(value = "/auth/pass")
@Log(title = "【计费模板审核】审核计费模板", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
@@ -371,17 +391,19 @@
site.setAccountingStrategyId(byId.getId());
}
siteService.updateBatchById(list);
- //
-
-
-
- //
accountingStrategyService.removeById(one.getId());
+
+ //推送三方平台
+ List<Integer> siteIds = list.stream().map(Site::getId).collect(Collectors.toList());
+ tcecClient.notificationStationChange(siteIds);
+
}
//硬件
+
+ List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(new LambdaQueryWrapper<TAccountingStrategyDetail>().eq(TAccountingStrategyDetail::getAccountingStrategyId, byId.getId()));
List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
for (TChargingPile tChargingPile : list) {
- integrationClient.setupBillingModel1(tChargingPile.getCode());
+ integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
}
}
}else {
--
Gitblit v1.7.1