From 1b81b84edaeea9b200c622e4a34c49b4b1aaac92 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 06 三月 2025 15:28:19 +0800
Subject: [PATCH] 修改bug和漏洞修复
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 488 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 408 insertions(+), 80 deletions(-)
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 b71a9d6..f269681 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
@@ -1,4 +1,5 @@
package com.ruoyi.order.controller;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.math.BigDecimal;
@@ -12,10 +13,7 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
-import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
-import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
-import com.ruoyi.chargingPile.api.feignClient.ParkingLotClient;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.chargingPile.api.feignClient.*;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
@@ -23,6 +21,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
@@ -57,6 +56,8 @@
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.AliQueryOrder;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -141,6 +142,10 @@
private TOrderInvoiceService invoiceService;
@Resource
private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+ @Resource
+ private PartnerClient partnerClient;
+ @Resource
+ private SysUserClient sysUserClient;
@@ -177,15 +182,90 @@
}
return R.ok();
}
-
+
@RequiresPermissions(value = {"/invoiceManagement/select_order", "/paymentOrder/order"}, logical = Logical.OR)
@ResponseBody
@PostMapping(value = "/pay/order/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) {
- return chargingOrderService.payOrderQuery(payOrderQueryDto);
+ Integer pageCurr = payOrderQueryDto.getPageCurr();
+ Integer pageSize = payOrderQueryDto.getPageSize();
+ payOrderQueryDto.setPageCurr(1);
+ payOrderQueryDto.setPageSize(10000999);
+ PageInfo<PayOrderDto> data = chargingOrderService.payOrderQuery(payOrderQueryDto).getData();
+ List<PayOrderDto> res = new ArrayList<>();
+ // 查询当前登陆人按钮权限
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Long userId = tokenService.getLoginUser().getUserid();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (userId != null){
+ List<GetSiteListDTO> data2 = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data2) {
+ siteIds.add(datum.getId());
+ }
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
+ List<TChargingOrder> list = chargingOrderService.list();
+ List<TParkingRecord> parkingRecord = parkingLotClient.getSiteIdAll().getData();
+ for (PayOrderDto record : data.getRecords()) {
+ if (record.getType() == 1){
+ TChargingOrder chargingOrder = list.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
+ if (chargingOrder!=null){
+ record.setSiteId(chargingOrder.getSiteId());
+ }
+ }
+ if (record.getType()==4){
+ TParkingRecord tParkingRecord = parkingRecord.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
+ if (tParkingRecord!=null){
+ record.setSiteId(tParkingRecord.getSiteId());
+ }
+ }
+ if (roleType==1||(record.getType()!=1&&record.getType()!=4)){
+ res.add(record);
+ continue;
+ }
+ if (roleType==2 && (record.getType()==1||record.getType()==4) && siteIds.contains(record.getSiteId())){
+ res.add(record);
+ }
+
+ }
+ List<PayOrderDto> res1 = testing5(res.size(), pageCurr, pageSize, res);
+ data.setTotal(res.size());
+ data.setRecords(res1);
+ return R.ok(data);
}
+
+
+
+ public static List<PayOrderDto> testing5(long total, long current, long size, List<PayOrderDto> str){
+ List<PayOrderDto> result = new ArrayList<>();
+ //获取初始化分页结构
+ com.ruoyi.order.util.Page<PayOrderDto> page = new com.ruoyi.order.util.Page().getPage(total, size, current - 1);
+ //获取集合下标初始值
+ long startIndex = page.getStartIndex();
+ //获取集合下标结束值
+ long endInddex = 0;
+ if(startIndex + page.getCurrent() >= total || size > total){
+ endInddex = total;
+ }else {
+ endInddex = Math.min(startIndex + page.getSize(), total);
+ }
+ //如果输入的开始查询下标大于集合大小，则查询为空值
+ if(startIndex > total){
+ result = Collections.emptyList();
+ }else{
+ result = str.subList((int)startIndex,(int)endInddex);
+ }
+ return result;
+}
+
+
+
@ResponseBody
@PostMapping(value = "/pay/order/refund")
@ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"})
@@ -256,6 +336,10 @@
return R.ok();
}
+
+
+
+
@ResponseBody
@GetMapping(value = "/pay/order/refund/detail")
@ApiOperation(value = "退款信息", tags = {"管理后台-支付订单-订单信息"})
@@ -291,6 +375,8 @@
if (byId.getAppUserCarId()!=null) {
List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();
payOrderChargingInfo.setCarNum(data3.get(0).getLicensePlate());
+ }else{
+ payOrderChargingInfo.setCarNum(byId.getPlateNum());
}
payOrderChargingInfo.setTChargingOrder(byId);
@@ -301,6 +387,8 @@
carid.add(byId.getAppUserCarId());
R<List<TAppUserCar>> carByIds = appUserCarClient.getCarByIds(carid);
payOrderChargingInfo.setCarNum(carByIds.getData().get(0).getLicensePlate());
+ }else{
+ payOrderChargingInfo.setCarNum(byId.getPlateNum());
}
payOrderChargingInfo.setStartTime(byId.getStartTime());
payOrderChargingInfo.setEndTime(byId.getEndTime());
@@ -331,13 +419,84 @@
@PostMapping(value = "/pay/order/refund/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-退款订单"})
public R<PageInfo<TChargingOrderRefund>> refundList(@RequestBody ChargingRefundDto chargingRefundDto) {
- R<PageInfo<TChargingOrderRefund>> refundList = chargingOrderService.getRefundList(chargingRefundDto);
- for (TChargingOrderRefund record : refundList.getData().getRecords()) {
- record.setUid(record.getId().toString());
+ Integer pageCurr = chargingRefundDto.getPageCurr();
+ Integer pageSize = chargingRefundDto.getPageSize();
+// R<PageInfo<TChargingOrderRefund>> refundList = chargingOrderService.getRefundList(chargingRefundDto);
+ chargingRefundDto.setPageCurr(1);
+ chargingRefundDto.setPageSize(199999999);
+ R<PageInfo<TChargingOrderRefund>> refundList1 = chargingOrderService.getRefundList(chargingRefundDto);
+ Long userId = tokenService.getLoginUser().getUserid();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (userId != null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }
+
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
}
- return refundList;
+ // 查询当前登陆人按钮权限
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
+ List<TChargingOrderRefund> tChargingOrderRefunds = new ArrayList<>();
+ for (TChargingOrderRefund record : refundList1.getData().getRecords()) {
+ if (roleType==1){
+ tChargingOrderRefunds.add(record);
+ continue;
+ }
+ if (record.getType()!=1){
+ tChargingOrderRefunds.add(record);
+ }
+ TChargingOrder byId = chargingOrderService.getById(record.getOrderId());
+ record.setUid(record.getId().toString());
+ if (byId==null){
+ continue;
+ }
+ if (roleType==2&&siteIds.contains(byId.getSiteId())){
+
+ tChargingOrderRefunds.add(record);
+ }
+ }
+ PageInfo<TChargingOrderRefund> data = refundList1.getData();
+
+ List<TChargingOrderRefund> res1 = testing4(tChargingOrderRefunds.size(), pageCurr, pageSize, tChargingOrderRefunds);
+ data.setTotal(tChargingOrderRefunds.size());
+ data.setRecords(res1);
+ return refundList1;
}
+
+
+
+
+ public static List<TChargingOrderRefund> testing4(long total, long current, long size, List<TChargingOrderRefund> str){
+ List<TChargingOrderRefund> result = new ArrayList<>();
+ //获取初始化分页结构
+ com.ruoyi.order.util.Page<TChargingOrderRefund> page = new com.ruoyi.order.util.Page().getPage(total, size, current - 1);
+ //获取集合下标初始值
+ long startIndex = page.getStartIndex();
+ //获取集合下标结束值
+ long endInddex = 0;
+ if(startIndex + page.getCurrent() >= total || size > total){
+ endInddex = total;
+ }else {
+ endInddex = Math.min(startIndex + page.getSize(), total);
+ }
+ //如果输入的开始查询下标大于集合大小，则查询为空值
+ if(startIndex > total){
+ result = Collections.emptyList();
+ }else{
+ result = str.subList((int)startIndex,(int)endInddex);
+ }
+ return result;
+ }
+
+
+
+
@ResponseBody
@PostMapping(value = "/pay/order/refund/list1")
@ApiOperation(value = "列表1", tags = {"管理后台-支付订单-退款订单"})
@@ -361,8 +520,14 @@
TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
return AjaxResult.success(res);
}
-
-
+
+
+ public static void main(String[] args) {
+ ;
+ System.err.println(Integer.parseInt("01"));
+ System.err.println(Integer.valueOf("01"));
+ ;
+ }
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -382,14 +547,34 @@
chargingOrderInfoVO.setVehicleModel(data.getVehicleModel());
chargingOrderInfoVO.setVehicleUse(data.getVehicleUse());
}
+ }else{
+ chargingOrderInfoVO.setLicensePlate(byId.getPlateNum());
}
// 时段总服务费
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
- String format = tChargingOrderAccountingStrategy.getCreateTime().format(formatter);
+ String format = "";
+ String format1 = "";
+// String temp1=list.get(0).getStartTime().split(":")[0];
+ System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
+ System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
+ System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
+ String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
+ if (Integer.parseInt(split[0])>=Integer.parseInt(temp1)){
+ format = byId.getCreateTime().format(formatter);
+ }else {
+ format = byId.getEndTime().format(formatter);
+ }
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
+ if (Integer.parseInt(split1[0])<Integer.parseInt(temp1)){
+ format1 = byId.getCreateTime().format(formatter);
+ }else {
+ format1 = byId.getEndTime().format(formatter);
+ }
tChargingOrderAccountingStrategy.setStartTime(format+" "+tChargingOrderAccountingStrategy.getStartTime());
- tChargingOrderAccountingStrategy.setEndTime(format+" "+tChargingOrderAccountingStrategy.getEndTime());
+ tChargingOrderAccountingStrategy.setEndTime(format1+" "+tChargingOrderAccountingStrategy.getEndTime());
if (byId.getVipDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
BigDecimal multiply = byId.getVipDiscountAmount().divide(byId.getServiceCharge(), 2)
.multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
@@ -405,6 +590,9 @@
return AjaxResult.success(chargingOrderInfoVO);
}
+
+
+
@ResponseBody
@PostMapping(value = "/addEvaluate")
@ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"})
@@ -413,6 +601,9 @@
orderEvaluateService.addOrderEvaluate(dto);
return AjaxResult.success();
}
+
+
+
/**
* 查询用户最近一次充电记录使用的车辆
*
@@ -432,6 +623,9 @@
return R.ok(-1L);
}
}
+
+
+
/**
* 查询会员在本月有多少次享受了充电折扣
@@ -446,6 +640,8 @@
.between(TChargingOrder::getStartTime, req.getStartTime(), req.getEndTime())).size();
return R.ok(size);
}
+
+
//用户订单数量
@PostMapping(value = "/useOrderCount")
public R<Long> useOrderCount(@RequestParam("userId") Long userId) {
@@ -454,11 +650,15 @@
return R.ok(count);
}
+
+
//订单详情
@PostMapping(value = "/detail")
public R<TChargingOrder> detail(@RequestParam("orderId") Long orderId) {
return R.ok(chargingOrderService.getById(orderId));
}
+
+
@PostMapping(value = "/getList")
public R<List<TChargingOrder>> getList(@RequestParam("siteId") Integer siteId) {
@@ -467,12 +667,35 @@
return R.ok(list);
}
+
+
@PostMapping(value = "/getBySiteIdAndTime")
public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {
List<ChargingOrderGroup> groups = chargingOrderService.chargingOrderGroup(chargingPercentProvinceDto);
return R.ok(groups);
}
+
+
+ /**
+ * 根据站点id和时间区间查询订单数据
+ * @param chargingPercentProvinceDto
+ * @return
+ */
+ @PostMapping(value = "/getOrderBySiteIdAndTime")
+ public R<List<TChargingOrder>> getOrderBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto){
+ LocalDate date1 = chargingPercentProvinceDto.getDate1();
+ LocalDate date2 = chargingPercentProvinceDto.getDate2();
+ String tripartitePlatformName = chargingPercentProvinceDto.getTripartitePlatformName();
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getSiteId, chargingPercentProvinceDto.getSiteIds())
+ .between(null != date1 && null != date2, TChargingOrder::getPayTime, date1.atTime(0, 0, 0), date2.atTime(23, 59, 59))
+ .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 5)
+ .eq(StringUtils.isNotEmpty(tripartitePlatformName), TChargingOrder::getOrderSource, 2)
+ .eq(StringUtils.isNotEmpty(tripartitePlatformName), TChargingOrder::getTripartitePlatformName, tripartitePlatformName));
+ return R.ok(list);
+ }
+
+
/**
* 根据充电枪id获取正在进行中的订单
@@ -578,6 +801,18 @@
/**
+ *
+ * @param code
+ */
+ @ResponseBody
+ @PostMapping(value = "/refund")
+ public R refund(@RequestParam(value = "code") String code){
+ chargingOrderService.refund(code);
+ return R.ok();
+ }
+
+
+ /**
* 远程启动失败后退款回调
*/
@ResponseBody
@@ -646,10 +881,11 @@
* @param vo
*/
@PostMapping("/endChargeBillingCharge")
- public void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
+ public R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo){
log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
- chargingOrderService.endChargeBillingCharge(vo);
+ return chargingOrderService.endChargeBillingCharge(vo);
}
+
@@ -721,7 +957,9 @@
}
//进行统计groupBySiteId
LocalDate sixBefore = PreviousSixMonths.get();
-
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore);
for (SixCircleDto sixCircleDto : sixCircleDtos) {
Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
@@ -800,7 +1038,18 @@
public R<Map<String,Object>> total() {
//count近6个月的数据
LocalDate sixBefore = PreviousSixMonths.get();
- Map<String,Object> map = chargingOrderService.countAll(sixBefore);
+ Long userId = tokenService.getLoginUser().getUserid();
+ //获取当前登录的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ List<GetSiteListDTO> data9 = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data9) {
+ siteIds.add(datum.getId());
+ }
+ //进行统计groupBySiteId
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
+ Map<String,Object> map = chargingOrderService.countAll(sixBefore,siteIds);
BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
if (map ==null){
map = new HashMap<String,Object>();
@@ -810,12 +1059,24 @@
map.put("shopAmount",data1);
BigDecimal data2 = vipOrderService.getSumAmout(sixBefore);
map.put("vipAmount",data2);
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().between(TChargingOrder::getCreateTime, sixBefore, LocalDate.now()).list();
+ BigDecimal serviceCharge = new BigDecimal("0");
+ BigDecimal commissionAmount = new BigDecimal("0");
+ for (TChargingOrder chargingOrder : list) {
+ if (chargingOrder.getOrderSource().equals(2)){
+ serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ commissionAmount = commissionAmount.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ }else{
+ serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge());
+ }
-
+ }
+ map.put("service_charge",serviceCharge);
+ map.put("commission_amount",commissionAmount);
return R.ok(map);
}
-
+
@RequiresPermissions(value = {"/chargeOrderMonitoring"}, logical = Logical.OR)
@ResponseBody
@@ -823,6 +1084,8 @@
@ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"})
public R watchChargingOrder(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery) {
Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
+ Integer roleType = sysUser.getRoleType();
List<Integer> siteIds = new ArrayList<>();
if (mongoChargingOrderQuery.getSiteId()==null){
List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userid).getData();
@@ -832,6 +1095,25 @@
}else {
siteIds.add(mongoChargingOrderQuery.getSiteId());
}
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }else{
+ if (roleType == 2){
+ List<Integer> integers = new ArrayList<>();
+ for (Integer siteId : siteIds) {
+ // 校验有没有这个站点的权限
+ List<Boolean> t1= partnerClient.watchChargingOrder(sysUser.getObjectId(),siteId).getData();
+ Boolean b = t1.get(1);
+ if (b){
+ integers.add(siteId);
+ }
+ }
+ siteIds = integers;
+ }
+ }
+ if (siteIds.isEmpty()){
+ siteIds.add(-1);
+ }
mongoChargingOrderQuery.setSiteIds(siteIds);
mongoChargingOrderQuery.setPageSize(10);
R<UploadRealTimeMonitoringPageData> all = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery);
@@ -839,7 +1121,13 @@
List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
Map<String,ChargingOrderVO> map = new HashMap<>();
+
for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1.getRecords()) {
+ if (roleType==2){
+ List<Boolean> data = partnerClient.watchChargingOrder(sysUser.getObjectId(), uploadRealTimeMonitoringData.getSiteId()).getData();
+ uploadRealTimeMonitoringData.setAuthInfo(data.get(0));
+ uploadRealTimeMonitoringData.setAuthDelete(data.get(1));
+ }
ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
ChargingOrderQuery dto = new ChargingOrderQuery();
dto.setCode(uploadRealTimeMonitoringData.getTransaction_serial_number());
@@ -852,7 +1140,11 @@
if (chargingOrderVO != null) {
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
+
BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
+ if (chargingOrderVO != null && chargingOrderVO.getOrderSource()==2){
+ dataDto.setPeriod_service_price(uploadRealTimeMonitoringData.getPeriod_service_price().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_DOWN)));
+ }
dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
@@ -927,6 +1219,7 @@
}else {
siteIds.add(statisticsQueryDto.getSiteId());
}
+ if (siteIds.isEmpty())siteIds.add(-1);
TCharingOrderMapVO tCharingOrderMapVO = new TCharingOrderMapVO();
@@ -1179,7 +1472,7 @@
@PostMapping(value = "/charging/users")
@ApiOperation(value = "除电站流量外", tags = {"管理后台-数据分析-充电用户分析"})
public R<TCharingUserMapVO> users(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
- Long userId = tokenService.getLoginUserApplet().getUserId();
+ Long userId = tokenService.getLoginUser().getUserid();
List<Integer> siteIds = new ArrayList<>();
if (statisticsQueryDto.getSiteId()==null){
@@ -1190,6 +1483,7 @@
}else {
siteIds.add(statisticsQueryDto.getSiteId());
}
+ if (siteIds.isEmpty())siteIds.add(-1);
statisticsQueryDto.setSiteIds(siteIds);
@@ -1552,11 +1846,9 @@
LocalDateTime min = selectDate.with(LocalTime.MIN);
LocalDateTime max = selectDate.with(LocalTime.MAX);
-
-
-
-
- List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds).ge( TChargingOrder::getCreateTime,min).le(BasePojo::getCreateTime,max).eq(TChargingOrder::getStatus,5).eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds)
+ .ge( TChargingOrder::getCreateTime,min).le(BasePojo::getCreateTime,max).eq(TChargingOrder::getStatus,5)
+ .eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();
//当日的订单总数
int size = list.size();
//计算list中paymentAmount的总和
@@ -1595,7 +1887,7 @@
siteIds.add(statisticsQueryDto.getSiteId());
}
if (statisticsQueryDto.getDayType()==1) {
- List<Map<String,Object>> charMap1 = chargingOrderService.getHourType(siteIds,statisticsQueryDto);
+ List<Map<String,Object>> charMap1 = chargingOrderService.getHourType(siteIds,statisticsQueryDto);
List<Map<String, Object>> charMap = new ArrayList<>();
// 生成从 "00:00" 到 "23:00" 的时间数据
for (int hour = 0; hour < 24; hour++) {
@@ -1722,20 +2014,18 @@
}
List<Map<String,Object>> capMap = chargingOrderService.getchargingCapacity(siteIds,statisticsQueryDto);
List<TChargingPile> chargingPiles = chargingPileClient.getChargingPileBySiteIds(siteIds).getData();
- //获取chargingPiles的ratedPower的总和再乘以chargingPiles的数量再乘以24
- BigDecimal totalRatedPower = chargingPiles.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(new BigDecimal(chargingPiles.size())).multiply(new BigDecimal(24));
-
- //将capMap的chargingCapacity除以totalRatedPower保留两位数
+ BigDecimal totalRatedPower = chargingPiles.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ //每日利用率=当日充电度数/（桩总功率*24小时）
+ BigDecimal multiply1 = totalRatedPower.multiply(new BigDecimal(24));
+ System.err.println(JSON.toJSONString(capMap) + "---" + chargingPiles.size() + "---" + totalRatedPower + "---" + multiply1);
capMap.forEach(map -> {
BigDecimal chargingCapacity = (BigDecimal) map.get("chargingCapacity");
- BigDecimal result = chargingCapacity.divide(totalRatedPower, 4, RoundingMode.HALF_UP);
+ BigDecimal result = chargingCapacity.divide(multiply1, 4, RoundingMode.HALF_UP);
BigDecimal multiply = result.multiply(new BigDecimal(100));
map.put("chargingCapacity", multiply);
});
-
-
- //
// 解析 startTime 和 endTime 为 LocalDate
LocalDate startDate = statisticsQueryDto.getStartTime();
LocalDate endDate = statisticsQueryDto.getEndTime();
@@ -1760,8 +2050,6 @@
startDate = startDate.plusDays(1);
}
return R.ok(dateRangeStatistics);
-
-
}
@@ -1815,49 +2103,6 @@
- private static List<TChargingOrder> getSampleData() {
- // 这里可以替换为实际查询逻辑
- List<TChargingOrder> list = new ArrayList<>();
- // 示例数据
- for (int i = 0; i < 24; i++) {
- TChargingOrder order = new TChargingOrder();
- order.setStartTime(LocalDateTime.now().minusHours(23 - i));
- order.setOrderAmount(BigDecimal.valueOf(i + 1));
- list.add(order);
- }
- return list;
- }
-
- private static List<Map<String, BigDecimal>> processData(List<TChargingOrder> list) {
- Map<LocalDateTime, BigDecimal> hourlySum = new HashMap<>();
-
- // 按每个小时分组并求和
- for (TChargingOrder order : list) {
- LocalDateTime hour = order.getStartTime().truncatedTo(ChronoUnit.HOURS);
- BigDecimal amount = order.getOrderAmount();
- hourlySum.merge(hour, amount, BigDecimal::add);
- }
-
- // 创建结果列表
- List<Map<String, BigDecimal>> resultList = new ArrayList<>();
- for (int i = 1; i <= 23; i++) {
- LocalDateTime keyHour = LocalDateTime.now().withHour(i);
- BigDecimal sum = BigDecimal.ZERO;
-
- // 计算键之后的一小时的数据之和
- for (int j = i + 1; j <= 23; j++) {
- LocalDateTime nextHour = LocalDateTime.now().withHour(j);
- sum = sum.add(hourlySum.getOrDefault(nextHour, BigDecimal.ZERO));
- }
-
- Map<String, BigDecimal> entry = new HashMap<>();
- entry.put(String.valueOf(i), sum);
- resultList.add(entry);
- }
-
- return resultList;
- }
-
/**
* 硬件充电结束后的处理逻辑
@@ -1868,6 +2113,8 @@
log.info(code + "：-------------------充电桩自动结束充电-------------------");
chargingOrderService.endCharge(code, 2);
}
+
+
/**
* 硬件异常结束充电后的处理逻辑
@@ -1890,6 +2137,8 @@
TChargingOrder chargingOrder = chargingOrderService.getChargingOrderByLicensePlate(query);
return R.ok(chargingOrder);
}
+
+
/**
* 修改充电订单
* @param chargingOrder
@@ -1940,4 +2189,83 @@
return R.ok(list);
}
+
+ /**
+ * 根据车牌号查询指定时间范围内的数据
+ * @param plateNum
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/getCarChargingOrderByPlateNum")
+ public R<List<TChargingOrder>> getCarChargingOrderByPlateNum(@RequestParam("plateNum") String plateNum, @RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime){
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPlateNum, plateNum).eq(TChargingOrder::getDelFlag, 0)
+ .in(TChargingOrder::getStatus, Arrays.asList(4, 5)).between(TChargingOrder::getStartTime, startTime, endTime));
+ return R.ok(list);
+ }
+
+
+ /**
+ * 添加三方平台充电订单数据
+ * @return
+ */
+ @PostMapping("/addTripartitePlatformOrder")
+ public R addTripartitePlatformOrder(@RequestBody AddTripartitePlatformOrder query){
+ return chargingOrderService.addTripartitePlatformOrder(query);
+ }
+
+
+
+
+
+ /**
+ * 根据三方平台订单id获取充电数据
+ * @param startChargeSeq
+ * @return
+ */
+ @PostMapping("/getChargingOrderByStartChargeSeq")
+ public R<TChargingOrder> getChargingOrderByStartChargeSeq(@RequestParam("startChargeSeq") String startChargeSeq){
+ TChargingOrder chargingOrder = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getStartChargeSeq, startChargeSeq));
+ return R.ok(chargingOrder);
+ }
+
+
+
+
+ /**
+ * 根据三方平台订单ids获取充电数据
+ * @param startChargeSeqs
+ * @return
+ */
+ @PostMapping("/getChargingOrderByStartChargeSeqs")
+ public R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(@RequestParam("startChargeSeqs") List<String> startChargeSeqs){
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getStartChargeSeq, startChargeSeqs));
+ return R.ok(list);
+ }
+
+
+ /**
+ * 三方平台请求停止充电
+ * @param startChargeSeq
+ * @return
+ */
+ @PostMapping("/tripartitePlatformStopCharge")
+ public R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq){
+ return chargingOrderService.tripartitePlatformStopCharge(startChargeSeq);
+ }
+
+
+ /**
+ * 临时接口
+ * 获取充电后没有扣除费用的数据
+ * @return
+ */
+ @GetMapping("/getNotPaymentChargingOrder")
+ public R getNotPaymentChargingOrder(){
+ return chargingOrderService.getNotPaymentChargingOrder();
+ }
+
+
+
}
--
Gitblit v1.7.1