From 17f6a2b4a45175845787d0b9be436e70480ef8a9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 18:22:27 +0800
Subject: [PATCH] 修改报表bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 6 ---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WatchChargingOrderVo.java | 24 ++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 34 +++++++++++-----
3 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 29b0a51..30cc8bd 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -35,9 +35,6 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
private Long id;
- @ApiModelProperty(value = "字符串主键")
- @TableField(exist = false)
- private String idStr;
@ApiModelProperty(value = "序号")
@TableField(exist = false)
private Integer xuhao;
@@ -296,8 +293,5 @@
@ApiModelProperty(value = "车辆品牌")
@TableField(exist = false)
private String vehicleModel;
- @ApiModelProperty(value = "时段数")
- @TableField(exist = false)
- private Long timeFrame;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index faa6696..b980704 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -54,6 +54,7 @@
import com.ruoyi.order.service.*;
import com.ruoyi.order.util.PreviousSixMonths;
import com.ruoyi.order.vo.EndOfChargePageInfo;
+import com.ruoyi.order.vo.WatchChargingOrderVo;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
@@ -63,14 +64,11 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
import com.ruoyi.system.api.model.SysUserRoleVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -1175,23 +1173,37 @@
PageInfo<TChargingOrder> orderPageInfo = chargingOrderService.page(pageInfo, queryWrapper.orderByDesc(TChargingOrder::getCreateTime));
List<Site> siteList = siteClient.getSiteAll().getData();
+ List<WatchChargingOrderVo> list = new ArrayList<>();
for (TChargingOrder record : orderPageInfo.getRecords()) {
- record.setIdStr(record.getId().toString());
+ WatchChargingOrderVo vo = new WatchChargingOrderVo();
+ BeanUtils.copyProperties(record, vo);
+ vo.setIdStr(record.getId().toString());
Site site = siteList.stream().filter(s->s.getId().equals(record.getSiteId())).findFirst().get();
- record.setSiteName(site.getName());
+ vo.setSiteName(site.getName());
TChargingPile chargingPile = chargingPileClient.getChargingPileById(record.getChargingPileId()).getData();
- record.setTerminalName(chargingPile.getName());
+ vo.setTerminalName(chargingPile.getName());
TChargingGun chargingGun = chargingGunClient.getChargingGunById(record.getChargingGunId()).getData();
- record.setTerminalCode(chargingGun.getName());
+ vo.setTerminalCode(chargingGun.getName());
if(null != record.getStartTime() && null != record.getEndTime()){
long time = record.getEndTime().toEpochSecond(ZoneOffset.UTC) - record.getStartTime().toEpochSecond(ZoneOffset.UTC);
- record.setChargingTime(time + "");
+ vo.setChargingTime(time + "");
}
long count = chargingOrderAccountingStrategyService.count(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, record.getId()));
- record.setTimeFrame(count);
+ vo.setTimeFrame(count);
+
+ vo.setAuthInfo(roleType == 1 ? true : partnerClient.authMenu(objectId, record.getSiteId(), SiteMenu.CHARGING_PILE_ORDER_MONITORING_RECORD_INFO.getValue()));
+ vo.setAuthDelete(roleType == 1 ? true : partnerClient.authMenu(objectId, record.getSiteId(), SiteMenu.CHARGING_PILE_ORDER_MONITORING_RECORD_DEL.getValue()));
+ list.add(vo);
}
- return R.ok(orderPageInfo);
+ PageInfo<WatchChargingOrderVo> pageInfos = new PageInfo<>(query.getPageCurr(), query.getPageSize());
+ pageInfos.setRecords(list);
+ pageInfos.setCurrent(pageInfo.getCurrent());
+ pageInfos.setPages(pageInfo.getPages());
+ pageInfos.setSize(pageInfo.getSize());
+ pageInfos.setStartIndex(pageInfo.getStartIndex());
+ pageInfos.setTotal(pageInfo.getTotal());
+ return R.ok(pageInfos);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WatchChargingOrderVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WatchChargingOrderVo.java
new file mode 100644
index 0000000..60a20f5
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/WatchChargingOrderVo.java
@@ -0,0 +1,24 @@
+package com.ruoyi.order.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.order.api.model.TChargingOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime; /**
+ * @author zhibing.pu
+ * @Date 2025/3/20 17:50
+ */
+@Data
+public class WatchChargingOrderVo extends TChargingOrder {
+ @ApiModelProperty(value = "字符串主键")
+ private String idStr;
+ @ApiModelProperty(value = "时段数")
+ private Long timeFrame;
+ @ApiModelProperty(value = "查看按钮权限 ")
+ private Boolean authInfo = true;
+ @ApiModelProperty(value = "删除按钮权限 ")
+ private Boolean authDelete = true;
+}
--
Gitblit v1.7.1