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/TApplyChargingPileController.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 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 98956eb..4170703 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
@@ -6,7 +6,9 @@
import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.utils.WebUtils;
+import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.order.api.model.ExportUidDto;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -97,12 +99,16 @@
/**
* 建桩申请
*/
- @Log(title = "建桩申请", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(tags = {"小程序-建桩申请"},value = "建桩申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@RequestBody TApplyChargingPileDTO dto) {
// 验证验证码
- String code = redisService.getCacheObject(dto.getLandlordPhone() + Constants.APPLY_CHARGING);
+ String code;
+ if(dto.getLandlordHandling().equals(1)){
+ code = redisService.getCacheObject(dto.getLandlordPhone() + Constants.APPLY_CHARGING);
+ }else {
+ code = redisService.getCacheObject(dto.getAgentPhone() + Constants.APPLY_CHARGING);
+ }
if(StringUtils.isEmpty(code)){
return AjaxResult.error("验证码已过期,请重新获取验证码!");
}
@@ -115,7 +121,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) {
@@ -125,9 +131,10 @@
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "列表")
@PostMapping(value = "/page")
- public AjaxResult<Page<TApplyChargingPile>> page(ApplyChargingQuery applyChargingQuery) {
+ public AjaxResult<Page<TApplyChargingPile>> page(@RequestBody ApplyChargingQuery applyChargingQuery) {
Page<TApplyChargingPile> page = applyChargingPileService.lambdaQuery()
.like(applyChargingQuery.getLandlordPhone() != null && !applyChargingQuery.getLandlordPhone().equals(""), TApplyChargingPile::getLandlordPhone, applyChargingQuery.getLandlordPhone())
+ .orderByDesc(BasePojo::getCreateTime )
.page(Page.of(applyChargingQuery.getPageCurr(), applyChargingQuery.getPageSize()));
return AjaxResult.ok(page);
}
@@ -135,6 +142,7 @@
@ApiOperation(tags = {"后台-申请表单-申请建桩"},value = "导出")
@PutMapping(value = "/export")
+ @Log(title = "【申请建桩】导出建桩申请列表", businessType = BusinessType.EXPORT)
public R export(String landlordPhone,HttpServletResponse response) {
try {
response.setCharacterEncoding(Constants.UTF8);
@@ -247,11 +255,12 @@
}
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/downloadBill")
- public R downloadBill(String uid,HttpServletResponse response)
+ @PutMapping("/downloadBill")
+ @Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
+ public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
- chargingListQuery.setUid(uid);
+ chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
chargingListQuery.setPageSize(99999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
@@ -288,8 +297,10 @@
}
@ApiOperation(value = "下载", tags = {"管理后台-账户结算账单"})
@PutMapping("/downloadAccount")
+ @Log(title = "【账户结算账单】下载账单", businessType = BusinessType.EXPORT)
public R downloadAccount(@RequestBody ChargingListQuery dto,HttpServletResponse response)
- {
+ { dto.setPageCurr(1);
+ dto.setPageSize(99999999);
AccountListVO data = orderClient.accountBillList(dto).getData();
try {
response.setCharacterEncoding(Constants.UTF8);
@@ -320,10 +331,13 @@
}
@ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
- @GetMapping("/downloadSettlementTotal")
- public R downloadSettlementTotal(String time,HttpServletResponse response)
+ @PutMapping("/downloadSettlementTotal")
+ @Log(title = "【结算汇总表】下载汇总表", businessType = BusinessType.EXPORT)
+ public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- SettlementTotalVO data = chargingOrderClient.settlementTotalR(time).getData();
+ SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
+
+
try {
response.setCharacterEncoding(Constants.UTF8);
response.setContentType("application/vnd.ms-excel");
@@ -336,7 +350,7 @@
try {
// excel模板封装
ExcelWriterBuilder excelWriterBuilder = EasyExcelFactory.write(response.getOutputStream());
- InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"运营商名称1-充电桩名称1-结算对账单明细-结算月份1" + ".xlsx");
+ InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"结算汇总" + ".xlsx");
// 自动释放资源
try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
@@ -353,10 +367,11 @@
return R.ok();
}
@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
- @GetMapping("/downloadSettlement")
- public R downloadSettlement(String uid,HttpServletResponse response)
+ @PutMapping("/downloadSettlement")
+ @Log(title = "【结算表记录】下载结算表", businessType = BusinessType.EXPORT)
+ public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid).getData();
+ TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData();
List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData();
if (!data1.isEmpty()){
data.setSiteName(data1.get(0).getName());
@@ -405,7 +420,8 @@
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/download")
+ @PutMapping("/download")
+ @Log(title = "【充电算账单】下载算账单", businessType = BusinessType.EXPORT)
public R download(String uid,HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
@@ -462,6 +478,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());
@@ -470,6 +487,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