From c7abf3bbb933e9dc8f3525bd3edfbeaa730d1c06 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 25 七月 2025 15:28:51 +0800
Subject: [PATCH] 大屏设置鉴权
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 de5b1ac..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
@@ -28,6 +28,7 @@
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;
@@ -44,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;
@@ -66,11 +68,14 @@
private TChargingPileService chargingPileService;
@Autowired
private ISiteService siteService;
- @Autowired
+ @Resource
private SysUserClient sysUserClient;
@Resource
private IntegrationClient integrationClient;
+
+ @Resource
+ private TCECClient tcecClient;
@Autowired
@@ -165,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)
@@ -267,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);
@@ -286,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);
}
@@ -386,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));
@@ -452,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