From 72a76cd3ad51a520100ec59481d99118ffebd33c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:18:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 8592ffb..2670e36 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
import com.ruoyi.chargingPile.api.model.*;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
@@ -14,6 +15,7 @@
import com.ruoyi.chargingPile.service.TChargingPileService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.SteategyPassDto;
+import com.ruoyi.common.core.enums.status.AppUserStatusEnum;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
@@ -62,6 +64,9 @@
private ISiteService siteService;
@Autowired
private SysUserClient sysUserClient;
+
+ @Resource
+ private IntegrationClient integrationClient;
@Autowired
@@ -114,6 +119,13 @@
Long userId = SecurityUtils.getLoginUser().getUserid();
dto.setUserId(userId);
accountingStrategyService.save(dto);
+ 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());
+ }
+ }
// 添加明细
dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
@@ -135,6 +147,9 @@
Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
if(!flag1){
return AjaxResult.error("同阶段费率值需一致");
+ }
+ if(Objects.isNull(dto.getDiscount())){
+ accountingStrategyService.update(Wrappers.<TAccountingStrategy>lambdaUpdate().set(TAccountingStrategy::getDiscount, null).eq(TAccountingStrategy::getId, dto.getId()));
}
// 判断修改的计费策略是否为已通过
if(null != dto.getAuditStatus() && (dto.getAuditStatus() == 3 || dto.getAuditStatus() == 4)){
@@ -175,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();
}
@@ -306,8 +329,7 @@
return AjaxResult.ok(accountingStrategyService.pageList(query));
}
- @Resource
- private IntegrationClient integrationClient;
+
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
@PostMapping(value = "/auth/pass")
@@ -355,6 +377,7 @@
}else if (byId.getAuditStatus()==2){
byId.setTwoRemark(steategyPassDto.getRemark());
+ byId.setTwoAuditTime(LocalDateTime.now());
}
byId.setAuditStatus(4);
--
Gitblit v1.7.1