From 11b718b78ee92d2349072c972e7155001693d69e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 920cac1..a4a794b 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
@@ -64,6 +64,9 @@
private ISiteService siteService;
@Autowired
private SysUserClient sysUserClient;
+
+ @Resource
+ private IntegrationClient integrationClient;
@Autowired
@@ -118,7 +121,7 @@
accountingStrategyService.save(dto);
if(null != dto.getSiteId()){
//下发硬件数据
- List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, dto.getSiteId()).list();
+ List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, dto.getSiteId()).eq(TChargingPile::getDelFlag, 0).list();
for (TChargingPile tChargingPile : list) {
integrationClient.setupBillingModel1(tChargingPile.getCode());
}
@@ -178,11 +181,6 @@
});
accountingStrategyDetailService.saveBatch(accountingStrategyDetails);
}
- //下发硬件数据
- List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, dto.getSiteId()).list();
- for (TChargingPile tChargingPile : list) {
- integrationClient.setupBillingModel1(tChargingPile.getCode());
- }
}else {
// 删除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
@@ -192,6 +190,14 @@
// 添加明细
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());
+ }
}
return AjaxResult.success();
}
@@ -321,10 +327,9 @@
@PostMapping(value = "/auth/pageList")
public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
- return AjaxResult.ok(accountingStrategyService.pageList(query));
+ return AjaxResult.ok(accountingStrategyService.pageList1(query));
}
- @Resource
- private IntegrationClient integrationClient;
+
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
@PostMapping(value = "/auth/pass")
@@ -372,6 +377,7 @@
}else if (byId.getAuditStatus()==2){
byId.setTwoRemark(steategyPassDto.getRemark());
+ byId.setTwoAuditTime(LocalDateTime.now());
}
byId.setAuditStatus(4);
--
Gitblit v1.7.1