From 7d7b731028fb11937dcbca92bc60858178a26dac Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 12:26:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 310 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 249 insertions(+), 61 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 336e258..94abbc7 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,12 +1,10 @@
package com.ruoyi.chargingPile.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.chargingPile.api.dto.TAccountingStrategyDTO;
import com.ruoyi.chargingPile.api.model.*;
+import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.TAccountingStrategyQuery;
import com.ruoyi.chargingPile.api.vo.TAccountingStrategyDetailVO;
import com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO;
@@ -17,14 +15,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.SteategyPassDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.domain.BaseDelete;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.security.service.TokenService;
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.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.integration.api.feignClient.IntegrationClient;
+import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,9 +33,13 @@
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
+import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
+
+import static com.ruoyi.common.core.context.SecurityContextHolder.getUserId;
/**
* <p>
@@ -59,8 +62,7 @@
private ISiteService siteService;
@Autowired
private SysUserClient sysUserClient;
- @Resource
- private TokenService tokenService;
+
@Autowired
public TAccountingStrategyController(TAccountingStrategyService accountingStrategyService, TAccountingStrategyDetailService accountingStrategyDetailService) {
@@ -85,7 +87,7 @@
public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam("strategyId") Integer strategyId) {
List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
list.forEach(detail -> {
- detail.setTotalPrice(detail.getElectrovalence().add(detail.getElectrovalence()));
+ detail.setTotalPrice(detail.getElectrovalence().add(detail.getServiceCharge()));
});
return AjaxResult.ok(list);
}
@@ -93,33 +95,100 @@
/**
* 添加计费策略管理
*/
- @Log(title = "添加计费策略", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "添加计费策略")
@PostMapping(value = "/add")
+ @Log(title = "【计费策略】添加计费策略", businessType = BusinessType.INSERT)
public AjaxResult<Integer> add(@RequestBody TAccountingStrategyDTO dto) {
+ if(null != dto.getSiteId()){
+ dto.setAuditStatus(3);
+ }
+ Boolean flag = accountingStrategyDetailService.isStrategy24Hour(dto.getAccountingStrategyDetails());
+ if(flag){
+ return AjaxResult.error("计费模板时间设置有误差");
+ }
+ // 判断同阶段是否价格不一致
+ Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
+ if(!flag1){
+ return AjaxResult.error("同阶段费率值需一致");
+ }
+ 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()).list();
+ for (TChargingPile tChargingPile : list) {
+ integrationClient.setupBillingModel1(tChargingPile.getCode());
+ }
+ }
// 添加明细
dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
- // TODO 硬件 同步策略到充电桩
return AjaxResult.ok(dto.getId());
}
/**
* 修改计费策略
*/
- @Log(title = "修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【计费策略】修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
- public AjaxResult<Boolean> update(@RequestBody TAccountingStrategyDTO dto) {
- // 删除计费策略明细信息
- accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
- .eq(TAccountingStrategyDetail::getAccountingStrategyId, dto.getId()));
- accountingStrategyService.updateById(dto);
- // 添加明细
- dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
- // TODO 硬件 同步策略到充电桩
- return AjaxResult.ok(accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails()));
+ public AjaxResult<String> update(@RequestBody TAccountingStrategyDTO dto) {
+ Boolean flag = accountingStrategyDetailService.isStrategy24Hour(dto.getAccountingStrategyDetails());
+ if(flag){
+ return AjaxResult.error("计费模板时间设置有误差");
+ }
+ // 判断同阶段是否价格不一致
+ Boolean flag1 = accountingStrategyDetailService.isStrategyPriceConsistent(dto.getAccountingStrategyDetails());
+ if(!flag1){
+ return AjaxResult.error("同阶段费率值需一致");
+ }
+ // 判断修改的计费策略是否为已通过
+ if(null != dto.getAuditStatus() && (dto.getAuditStatus() == 3 || dto.getAuditStatus() == 4)){
+ // 查询是否有下级审核中的策略
+ TAccountingStrategy children = accountingStrategyService.getOne(Wrappers.lambdaQuery(TAccountingStrategy.class)
+ .eq(TAccountingStrategy::getParentId, dto.getId())
+ .ne(TAccountingStrategy::getAuditStatus, Arrays.asList(3,4)));
+ if(Objects.nonNull(children)){
+ // 删除计费策略明细信息
+ accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, children.getId()));
+ dto.setAuditStatus(1);
+ accountingStrategyService.updateById(dto);
+ // 添加明细
+ dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
+ accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
+ }else {
+ Long userId = SecurityUtils.getLoginUser().getUserid();
+ dto.setUserId(userId);
+ dto.setAuditStatus(1);
+ dto.setParentId(dto.getId());
+ dto.setId(null);
+ accountingStrategyService.save(dto);
+ // 添加明细
+ List<TAccountingStrategyDetail> accountingStrategyDetails = dto.getAccountingStrategyDetails();
+ accountingStrategyDetails.forEach(detail -> {
+ detail.setAccountingStrategyId(dto.getId());
+ detail.setId(null);
+ });
+ 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)
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, dto.getId()));
+ dto.setAuditStatus(1);
+ accountingStrategyService.updateById(dto);
+ // 添加明细
+ dto.getAccountingStrategyDetails().forEach(detail -> detail.setAccountingStrategyId(dto.getId()));
+ accountingStrategyDetailService.saveBatch(dto.getAccountingStrategyDetails());
+ }
+ return AjaxResult.success();
}
/**
@@ -132,20 +201,81 @@
TAccountingStrategyVO accountingStrategyVO = new TAccountingStrategyVO();
BeanUtils.copyProperties(accountingStrategy,accountingStrategyVO);
// 查询用户信息
- String firstUserName = sysUserClient.getSysUser(accountingStrategy.getFirstUserId()).getData().getNickName();
- String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
- accountingStrategyVO.setFirstUserName(firstUserName);
- accountingStrategyVO.setTwoUserName(twoUserName);
+ if(null != accountingStrategy.getFirstUserId()){
+ String firstUserName = sysUserClient.getSysUser(accountingStrategy.getFirstUserId()).getData().getNickName();
+ accountingStrategyVO.setFirstUserName(firstUserName);
+ }
+ if(null != accountingStrategy.getTwoUserId()){
+ String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
+ accountingStrategyVO.setTwoUserName(twoUserName);
+ }
+ return AjaxResult.ok(accountingStrategyVO);
+ }
+
+ /**
+ * 查看计费策略详情-修改后
+ */
+ @ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "查看计费策略详情修改后children的数据")
+ @GetMapping(value = "/getDetailChildrenById")
+ public AjaxResult<TAccountingStrategyVO> getDetailChildrenById(@RequestParam("id") Integer id) {
+ TAccountingStrategyVO accountingStrategyVO = new TAccountingStrategyVO();
+ // 先查询children对象
+ TAccountingStrategy children = accountingStrategyService.getOne(Wrappers.lambdaQuery(TAccountingStrategy.class)
+ .eq(TAccountingStrategy::getParentId, id)
+ .orderByDesc(TAccountingStrategy::getCreateTime)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(children)){
+ BeanUtils.copyProperties(children,accountingStrategyVO);
+ // 查询用户信息
+ if(null != children.getFirstUserId()){
+ String firstUserName = sysUserClient.getSysUser(children.getFirstUserId()).getData().getNickName();
+ accountingStrategyVO.setFirstUserName(firstUserName);
+ }
+ if(null != children.getTwoUserId()){
+ String twoUserName = sysUserClient.getSysUser(children.getTwoUserId()).getData().getNickName();
+ accountingStrategyVO.setTwoUserName(twoUserName);
+ }
+ if(null != children.getUserId()){
+ String userName = sysUserClient.getSysUser(children.getUserId()).getData().getNickName();
+ accountingStrategyVO.setUserName(userName);
+ }
+ accountingStrategyVO.setAccountingStrategyDetailList(accountingStrategyDetailService.list(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, children.getId())));
+ }else {
+ TAccountingStrategy accountingStrategy = accountingStrategyService.getById(id);
+ BeanUtils.copyProperties(accountingStrategy,accountingStrategyVO);
+ // 查询用户信息
+ if(null != accountingStrategy.getFirstUserId()){
+ String firstUserName = sysUserClient.getSysUser(accountingStrategy.getFirstUserId()).getData().getNickName();
+ accountingStrategyVO.setFirstUserName(firstUserName);
+ }
+ if(null != accountingStrategy.getTwoUserId()){
+ String twoUserName = sysUserClient.getSysUser(accountingStrategy.getTwoUserId()).getData().getNickName();
+ accountingStrategyVO.setTwoUserName(twoUserName);
+ }
+ if(null != children.getUserId()){
+ String userName = sysUserClient.getSysUser(children.getUserId()).getData().getNickName();
+ accountingStrategyVO.setUserName(userName);
+ }
+ accountingStrategyVO.setAccountingStrategyDetailList(accountingStrategyDetailService.list(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
+ .eq(TAccountingStrategyDetail::getAccountingStrategyId, id)));
+ }
return AjaxResult.ok(accountingStrategyVO);
}
/**
* 删除计费策略
*/
- @Log(title = "删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【计费策略】删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam("id") Integer id) {
+ // 判断策略是否在使用
+ long count = siteService.count(Wrappers.lambdaQuery(Site.class)
+ .eq(Site::getAccountingStrategyId, id));
+ if(count>0){
+ return AjaxResult.error("该计费策略正在使用中，无法删除");
+ }
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
.eq(TAccountingStrategyDetail::getAccountingStrategyId, id));
@@ -155,11 +285,17 @@
/**
* 批量删除计费策略
*/
- @Log(title = "批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【计费策略】批量删除计费策略", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
@DeleteMapping(value = "/deleteByIds")
public AjaxResult<Boolean> deleteByIds(@RequestParam String ids) {
String[] split = ids.split(",");
+ // 判断策略是否在使用
+ long count = siteService.count(Wrappers.lambdaQuery(Site.class)
+ .in(Site::getAccountingStrategyId, Arrays.asList(split)));
+ if(count>0){
+ return AjaxResult.error("该计费策略正在使用中，无法删除");
+ }
// 刪除计费策略明细信息
accountingStrategyDetailService.remove(Wrappers.lambdaQuery(TAccountingStrategyDetail.class)
.in(TAccountingStrategyDetail::getAccountingStrategyId, Arrays.asList(split)));
@@ -180,43 +316,82 @@
@PostMapping(value = "/auth/pageList")
public AjaxResult<PageInfo<TAccountingStrategyVO>> authPageList(@RequestBody TAccountingStrategyQuery query) {
-
-
return AjaxResult.ok(accountingStrategyService.pageList(query));
}
+ @Resource
+ private IntegrationClient integrationClient;
-// @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
-// @PostMapping(value = "/auth/pass")
-// public AjaxResult<PageInfo<TAccountingStrategyVO>> authPass(@RequestBody SteategyPassDto steategyPassDto) {
-// TAccountingStrategy byId = accountingStrategyService.getById(steategyPassDto.getId());
-// Long userId = tokenService.getLoginUser().getSysUser().getUserId();
-// if (byId.getAuditStatus()==1&&byId.getFirstUserId()!=userId){
-// return AjaxResult.error("您不是一级审核人员，无法审核");
-// }
-// if (byId.getAuditStatus()==2&&byId.getTwoUserId()!=userId){
-// return AjaxResult.error("您不是二级审核人员，无法审核");
-// }
-// if (steategyPassDto.getPass()==1){
-// if (byId.getAuditStatus()==1){
-//
-// byId.setAuditStatus(2);
-// byId.setFirstRemark(steategyPassDto.getRemark());
-//
-// }else if (byId.getAuditStatus()==2){
-// byId.setAuditStatus(3);
-// byId.setTwoRemark(steategyPassDto.getRemark());
-//
-// }
-// }else {
-// byId.setAuditStatus(4);
-// }
-//
-//
-//
-//
-//
-//
-// }
+ @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "审核")
+ @PostMapping(value = "/auth/pass")
+ @Log(title = "【计费模板审核】审核计费模板", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
+ public AjaxResult<PageInfo<TAccountingStrategyVO>> authPass(@RequestBody SteategyPassDto steategyPassDto) {
+ TAccountingStrategy byId = accountingStrategyService.getById(steategyPassDto.getId());
+ Long userId = SecurityUtils.getLoginUser().getUserid();
+ if (byId.getAuditStatus()==1&&byId.getFirstUserId()!=userId){
+ return AjaxResult.error("您不是一级审核人员，无法审核");
+ }
+ if (byId.getAuditStatus()==2&&byId.getTwoUserId()!=userId){
+ return AjaxResult.error("您不是二级审核人员，无法审核");
+ }
+ if (steategyPassDto.getPass()==1){
+ if (byId.getAuditStatus()==1){
+
+ byId.setAuditStatus(2);
+ byId.setFirstRemark(steategyPassDto.getRemark());
+ byId.setFirstAuditTime(LocalDateTime.now());
+
+ }else if (byId.getAuditStatus()==2){
+ byId.setAuditStatus(3);
+ byId.setTwoRemark(steategyPassDto.getRemark());
+ byId.setTwoAuditTime(LocalDateTime.now());
+
+ //如果parentId不为空，则将parentId对应的siteId改为现在的，并且将parenId对应的数据删除
+ if (byId.getParentId()!=null) {
+ TAccountingStrategy one = accountingStrategyService.lambdaQuery().eq(TAccountingStrategy::getId, byId.getParentId()).one();
+ byId.setSiteId(one.getSiteId());
+ //将site表对应的模板id修改为新的这个
+ Site byId1 = siteService.getById(one.getSiteId());
+ byId1.setAccountingStrategyId(byId.getId());
+ siteService.updateById(byId1);
+ }
+ //硬件
+ List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
+ for (TChargingPile tChargingPile : list) {
+ integrationClient.setupBillingModel1(tChargingPile.getCode());
+ }
+ }
+ }else {
+ if (byId.getAuditStatus()==1){
+
+ byId.setFirstRemark(steategyPassDto.getRemark());
+
+ }else if (byId.getAuditStatus()==2){
+ byId.setTwoRemark(steategyPassDto.getRemark());
+ }
+
+ byId.setAuditStatus(4);
+ }
+ accountingStrategyService.updateById(byId);
+
+ return AjaxResult.success();
+
+
+
+
+ }
+
+
+ @ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "删除")
+ @DeleteMapping(value = "/delete")
+ @Log(title = "【计费模板审核】删除计费模板审核", businessType = BusinessType.DELETE)
+ public R delete(String ids) {
+ String[] split = ids.split(",");
+ for (String s : split) {
+ accountingStrategyService.removeById(s);
+ }
+ return R.ok();
+
+ }
/**
* 小程序远程调用 根据会员折扣、预付金额 计算服务费
@@ -282,5 +457,18 @@
return R.ok(res);
}
+
+
+ /**
+ * 根据id查询数据
+ * @param id
+ * @return
+ */
+ @PostMapping(value = "/getAccountingStrategyById")
+ public R<TAccountingStrategy> getAccountingStrategyById(@RequestParam("id") Integer id) {
+ TAccountingStrategy accountingStrategy = accountingStrategyService.getById(id);
+ return R.ok(accountingStrategy);
+ }
+
}
--
Gitblit v1.7.1