From 40ac76e3c6cc0104544df629aa34d7d53c87b00d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 二月 2025 15:10:41 +0800
Subject: [PATCH] 补充管理后台文件上传
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 258 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 187 insertions(+), 71 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 131e1fe..05be148 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;
@@ -20,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;
@@ -208,16 +210,19 @@
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 byId = chargingOrderService.getById(record.getId());
- record.setSiteId(byId.getSiteId());
+ 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){
- Integer siteId=parkingLotClient.getSiteIdByOrderId(Long.valueOf(record.getId())).getData();
- if (siteId!=null){
- record.setSiteId(siteId);
+ 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)){
@@ -234,6 +239,9 @@
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<>();
//获取初始化分页结构
@@ -255,6 +263,9 @@
}
return result;
}
+
+
+
@ResponseBody
@PostMapping(value = "/pay/order/refund")
@ApiOperation(value = "退款", tags = {"管理后台-支付订单-订单信息"})
@@ -325,6 +336,10 @@
return R.ok();
}
+
+
+
+
@ResponseBody
@GetMapping(value = "/pay/order/refund/detail")
@ApiOperation(value = "退款信息", tags = {"管理后台-支付订单-订单信息"})
@@ -360,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);
@@ -370,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());
@@ -470,6 +489,10 @@
}
return result;
}
+
+
+
+
@ResponseBody
@PostMapping(value = "/pay/order/refund/list1")
@ApiOperation(value = "列表1", tags = {"管理后台-支付订单-退款订单"})
@@ -493,8 +516,13 @@
TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
return AjaxResult.success(res);
}
-
-
+
+
+ public static void main(String[] args) {
+ String temp = "00";
+ Integer i = Integer.valueOf(temp);
+ System.err.println(i);
+ }
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -514,14 +542,30 @@
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];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
+ if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
+ format = byId.getCreateTime().format(formatter);
+ }else {
+ format = byId.getEndTime().format(formatter);
+ }
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
+ if (Integer.parseInt(split1[0])<Integer.valueOf(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());
@@ -578,6 +622,8 @@
.between(TChargingOrder::getStartTime, req.getStartTime(), req.getEndTime())).size();
return R.ok(size);
}
+
+
//用户订单数量
@PostMapping(value = "/useOrderCount")
public R<Long> useOrderCount(@RequestParam("userId") Long userId) {
@@ -586,11 +632,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) {
@@ -599,12 +649,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获取正在进行中的订单
@@ -710,6 +783,18 @@
/**
+ *
+ * @param code
+ */
+ @ResponseBody
+ @PostMapping(value = "/refund")
+ public R refund(@RequestParam(value = "code") String code){
+ chargingOrderService.refund(code);
+ return R.ok();
+ }
+
+
+ /**
* 远程启动失败后退款回调
*/
@ResponseBody
@@ -778,17 +863,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);
}
-
-
-// @PostMapping("/endChargeBillingCharge1")
-// public void endChargeBillingCharge1(@RequestBody TransactionRecordMessageVO vo){
-// log.info("-------------------停止充电返回账单后计算费用及修改业务状态-------------------：" + vo);
-// chargingOrderService.endChargeBillingCharge1(vo);
-// }
+
@@ -1733,11 +1812,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的总和
@@ -1776,7 +1853,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++) {
@@ -1903,10 +1980,11 @@
}
List<Map<String,Object>> capMap = chargingOrderService.getchargingCapacity(siteIds,statisticsQueryDto);
List<TChargingPile> chargingPiles = chargingPileClient.getChargingPileBySiteIds(siteIds).getData();
- BigDecimal totalRatedPower = chargingPiles.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(new BigDecimal(chargingPiles.size())).multiply(new BigDecimal(24));
+ BigDecimal totalRatedPower = chargingPiles.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add);
- //每日利用率=当日充电度数/（总桩数量*桩总功率*24小时）
- BigDecimal multiply1 = new BigDecimal(chargingPiles.size()).multiply(totalRatedPower).multiply(new BigDecimal(24));
+ //每日利用率=当日充电度数/（桩总功率*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(multiply1, 4, RoundingMode.HALF_UP);
@@ -1991,49 +2069,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;
- }
-
/**
* 硬件充电结束后的处理逻辑
@@ -2044,6 +2079,8 @@
log.info(code + "：-------------------充电桩自动结束充电-------------------");
chargingOrderService.endCharge(code, 2);
}
+
+
/**
* 硬件异常结束充电后的处理逻辑
@@ -2066,6 +2103,8 @@
TChargingOrder chargingOrder = chargingOrderService.getChargingOrderByLicensePlate(query);
return R.ok(chargingOrder);
}
+
+
/**
* 修改充电订单
* @param chargingOrder
@@ -2116,4 +2155,81 @@
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