From a738f7d328e037abe189c14c94d7ef835bf8296c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 09:27:46 +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/TApplyChargingPileController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index 2314df7..74e0baf 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -98,7 +98,6 @@
/**
* 建桩申请
*/
- @Log(title = "建桩申请", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(tags = {"小程序-建桩申请"},value = "建桩申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TApplyChargingPileDTO dto) {
@@ -121,7 +120,7 @@
return AjaxResult.ok(applyChargingPileService.save(dto));
}
- @Log(title = "建桩申请", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
+ @Log(title = "【申请建桩】添加建桩申请", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "建桩申请")
@PostMapping(value = "/manage/add")
public AjaxResult<Boolean> manageAdd(@RequestBody TApplyChargingPile dto) {
@@ -141,6 +140,7 @@
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "导出")
@PutMapping(value = "/export")
+ @Log(title = "【申请建桩】导出建桩申请列表", businessType = BusinessType.EXPORT)
public R export(String landlordPhone,HttpServletResponse response) {
try {
response.setCharacterEncoding(Constants.UTF8);
@@ -254,6 +254,7 @@
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
@PutMapping("/downloadBill")
+ @Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
@@ -294,6 +295,7 @@
}
@ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
@PutMapping("/downloadAccount")
+ @Log(title = "【账户结算账单】下载账单", businessType = BusinessType.EXPORT)
public R downloadAccount(@RequestBody ChargingListQuery dto,HttpServletResponse response)
{ dto.setPageCurr(1);
dto.setPageSize(99999999);
@@ -328,6 +330,7 @@
@ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
@PutMapping("/downloadSettlementTotal")
+ @Log(title = "【结算汇总表】下载汇总表", businessType = BusinessType.EXPORT)
public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
@@ -363,6 +366,7 @@
}
@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
@PutMapping("/downloadSettlement")
+ @Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT)
public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData();
@@ -415,6 +419,7 @@
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
@PutMapping("/download")
+ @Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
public R download(String uid,HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
@@ -471,6 +476,7 @@
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "修改备注")
@PostMapping(value = "/remark")
+ @Log(title = "【申请建桩】修改备注", businessType = BusinessType.UPDATE)
public AjaxResult<TApplyChargingPile> remark(@RequestBody ApplyChargingRemarkDto applyChargingRemarkDt) {
TApplyChargingPile byId = applyChargingPileService.getById(applyChargingRemarkDt.getId());
byId.setRemark(applyChargingRemarkDt.getRemark());
@@ -479,6 +485,7 @@
}
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "删除")
@DeleteMapping(value = "/remark")
+ @Log(title = "【申请建桩】删除建桩申请", businessType = BusinessType.DELETE)
public AjaxResult remark(String ids) {
String[] split = ids.split(",");
--
Gitblit v1.7.1