From ff265ba53df1d9e89ae2d4258007cd2e02811f8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 七月 2025 18:16:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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 1bb2f6e..64609a7 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
@@ -23,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;
@@ -42,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;
@@ -64,11 +68,14 @@
private TChargingPileService chargingPileService;
@Autowired
private ISiteService siteService;
- @Autowired
+ @Resource
private SysUserClient sysUserClient;
@Resource
private IntegrationClient integrationClient;
+
+ @Resource
+ private TCECClient tcecClient;
@Autowired
@@ -80,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) {
@@ -89,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) {
@@ -137,6 +148,7 @@
/**
* 修改计费策略
*/
+ @RequiresPermissions(value = {"/accountingStrategy/update"}, logical = Logical.OR)
@Log(title = "【计费策略】修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
@@ -158,7 +170,7 @@
// 查询是否有下级审核中的策略
TAccountingStrategy children = accountingStrategyService.getOne(Wrappers.lambdaQuery(TAccountingStrategy.class)
.eq(TAccountingStrategy::getParentId, dto.getId())
- .ne(TAccountingStrategy::getAuditStatus, Arrays.asList(3,4)));
+ .notIn(TAccountingStrategy::getAuditStatus, Arrays.asList(3,4)));
if(Objects.nonNull(children)){
// 删除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
@@ -213,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) {
@@ -259,7 +272,7 @@
accountingStrategyVO.setUserName(userName);
}
accountingStrategyVO.setAccountingStrategyDetailList(accountingStrategyDetailService.list(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, children.getId())));
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, children.getId()).eq(TAccountingStrategyDetail::getDelFlag, 0)));
}else {
TAccountingStrategy accountingStrategy = accountingStrategyService.getById(id);
BeanUtils.copyProperties(accountingStrategy,accountingStrategyVO);
@@ -278,7 +291,7 @@
accountingStrategyVO.setUserName(userName);
}
accountingStrategyVO.setAccountingStrategyDetailList(accountingStrategyDetailService.list(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, id)));
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, id).eq(TAccountingStrategyDetail::getDelFlag, 0)));
}
return AjaxResult.ok(accountingStrategyVO);
}
@@ -286,6 +299,7 @@
/**
* 删除计费策略
*/
+ @RequiresPermissions(value = {"/accountingStrategy/del"}, logical = Logical.OR)
@Log(title = "【计费策略】删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
@DeleteMapping(value = "/deleteById")
@@ -305,6 +319,7 @@
/**
* 批量删除计费策略
*/
+ @RequiresPermissions(value = {"/accountingStrategy/del"}, logical = Logical.OR)
@Log(title = "【计费策略】批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
@@ -329,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) {
@@ -339,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)
@@ -374,16 +391,17 @@
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<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailService.list(new LambdaQueryWrapper<TAccountingStrategyDetail>()
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, byId.getId()).eq(TAccountingStrategyDetail::getDelFlag, 0));
List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
for (TChargingPile tChargingPile : list) {
integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
@@ -440,7 +458,7 @@
// 会员折扣
BigDecimal discount = one1.getDiscount();
List<TAccountingStrategyDetail> list = accountingStrategyDetailService.lambdaQuery().eq(TAccountingStrategyDetail::getAccountingStrategyId, one1.getId())
- .list();
+ .eq(TAccountingStrategyDetail::getDelFlag, 0).list();
// 当前时间属于哪个计费策略
LocalTime now = LocalTime.now();
// 电价
--
Gitblit v1.7.1