From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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 b871f24..48c30cf 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
@@ -100,9 +100,9 @@
/**
* 添加计费策略管理
*/
- @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);
@@ -128,7 +128,7 @@
/**
* 修改计费策略
*/
- @Log(title = "修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
+ @Log(title = "【计费策略】修改计费策略", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
@ApiOperation(tags = {"后台-计费策略", "管理后台-站点管理"},value = "修改计费策略")
@PostMapping(value = "/update")
public AjaxResult<String> update(@RequestBody TAccountingStrategyDTO dto) {
@@ -251,7 +251,7 @@
/**
* 删除计费策略
*/
- @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) {
@@ -270,7 +270,7 @@
/**
* 批量删除计费策略
*/
- @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) {
@@ -306,6 +306,7 @@
@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();
@@ -326,6 +327,20 @@
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);
+ }
+
+ //硬件
+
+
}
}else {
byId.setAuditStatus(4);
@@ -342,6 +357,7 @@
@ApiOperation(tags = {"后台-申请表单-计费模板审核"},value = "删除")
@DeleteMapping(value = "/delete")
+ @Log(title = "【计费模板审核】删除计费模板审核", businessType = BusinessType.DELETE)
public R delete(String ids) {
String[] split = ids.split(",");
for (String s : split) {
@@ -415,5 +431,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