From 7e73e670d70e860bce6c216c23a75d366982c3c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 十月 2024 17:26:03 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 240 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 196 insertions(+), 44 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 f011021..eca723a 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
@@ -61,6 +61,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.models.auth.In;
import jdk.nashorn.internal.runtime.ListAdapter;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,10 +69,12 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
@@ -137,8 +140,27 @@
private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
-
-
+ /**
+ * 远程调用根据枪id 查询最新的订单id 用户后台结束充电
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping(value = "/queryOrderByGunId/{id}")
+ public R<String> queryOrderByGunId(@PathVariable("id") String id) {
+ List<Integer> integers = new ArrayList<>();
+ integers.add(2);
+ integers.add(3);
+ integers.add(4);
+ TChargingOrder one = chargingOrderService.lambdaQuery()
+ .eq(TChargingOrder::getChargingGunId, id)
+ .in(TChargingOrder::getStatus, integers)
+ .one();
+ if (one!=null){
+ return R.ok(one.getId().toString());
+ }
+ return R.ok();
+ }
@ResponseBody
@PostMapping(value = "/pay/order/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
@@ -320,10 +342,10 @@
* @param
* @return
*/
- @GetMapping(value = "/getCar")
- public R<Long> getCar() {
+ @GetMapping(value = "/getCar/{id}")
+ public R<Long> getCar(@PathVariable("id")String id) {
List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
- .eq(TChargingOrder::getAppUserId, tokenService.getLoginUserApplet().getUserId())
+ .eq(TChargingOrder::getAppUserId, id)
.isNotNull(TChargingOrder::getAppUserCarId));
if (!list.isEmpty()){
// 最近使用的车辆id
@@ -428,23 +450,36 @@
/**
* 充电充值支付回调
- * @param request
*/
@ResponseBody
@PostMapping(value = "/chargingOrderWXCallback")
- public void chargingOrderWXCallback(HttpServletRequest request) {
- Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
- if (null != data) {
- String out_trade_no = data.get("out_trade_no").toString();
- String transaction_id = data.get("transaction_id").toString();
- String attach = data.get("attach").toString();
- AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(1, out_trade_no, transaction_id, attach);
- if (ajaxResult.isSuccess()) {
- wxPaymentClient.ack();
- }
- }
+ public void chargingOrderWXCallback(@RequestParam("out_trade_no") String out_trade_no, @RequestParam("transaction_id") String transaction_id,
+ @RequestParam("attach") String attach) {
+ AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(1, out_trade_no, transaction_id, attach);
}
-
+
+
+ /**
+ * 修改安全检测数据
+ * @param securityDetection
+ */
+ @ResponseBody
+ @PostMapping(value = "/securityDetection")
+ public void securityDetection(@RequestBody SecurityDetection securityDetection){
+ chargingOrderService.securityDetection(securityDetection);
+ }
+
+ /**
+ * 远程启动充电应答
+ * @param message
+ */
+ @ResponseBody
+ @PostMapping(value = "/startChargeSuccessfully")
+ public void startChargeSuccessfully(@RequestBody PlatformStartChargingReplyMessage message){
+ chargingOrderService.startChargeSuccessfully(message);
+ }
+
+
/**
* 支付宝支付成功后的回调
@@ -471,19 +506,14 @@
/**
* 远程启动失败后退款回调
- * @param request
*/
@ResponseBody
@PostMapping(value = "/chargingOrderStartupFailureWxRefund")
- public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){
- WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
- if(null != data){
- String out_refund_no = data.getOut_refund_no();
- String refund_id = data.getRefund_id();
- String tradeState = data.getTradeState();
- String success_time = data.getSuccess_time();
- chargingOrderService.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time);
- }
+ public void chargingOrderStartupFailureWxRefund(@RequestParam("out_trade_no") String out_refund_no,
+ @RequestParam("out_trade_no") String refund_id,
+ @RequestParam("out_trade_no") String tradeState,
+ @RequestParam("out_trade_no") String success_time){
+ chargingOrderService.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time);
}
@@ -625,7 +655,7 @@
@ResponseBody
@PostMapping(value = "/watch/chargingOrder")
@ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"})
- public AjaxResult<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingOrderQuery dto) {
+ public R<List<ChargingOrderAndUploadRealTimeMonitoringDataDto>> watchChargingOrder(@RequestBody ChargingOrderQuery dto) {
Integer page = dto.getPageCurr();
Integer pageSize = dto.getPageSize();
List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
@@ -652,7 +682,7 @@
}
- return AjaxResult.success(res);
+ return R.ok(dtos);
}
@@ -971,23 +1001,118 @@
siteIds.add(statisticsQueryDto.getSiteId());
}
if (statisticsQueryDto.getDayType()==1) {
- List<Map<String,Object>> charMap = 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++) {
+ String time = String.format("%02d:00", hour);
+ Map<String, Object> mapWithTimeValue = findMapWithTimeValue(charMap1, time);
+ if (mapWithTimeValue!=null){
+ charMap.add(mapWithTimeValue);
+ }else {
+ Map<String, Object> timeMap = new HashMap<>();
+ timeMap.put("time", time); // 初始化值为 null
+ timeMap.put("electrovalence", 0);
+ timeMap.put("orderCount", 0);
+ timeMap.put("servicecharge", 0);
+ timeMap.put("electricity", 0);
+ charMap.add(timeMap);
+ }
+ }
return R.ok(charMap);
}else if (statisticsQueryDto.getDayType()==2){
- List<Map<String,Object>> charMap = chargingOrderService.getDateType(siteIds,statisticsQueryDto);
- return R.ok(charMap);
- }else if (statisticsQueryDto.getDayType()==3){
- List<Map<String,Object>> charMap = chargingOrderService.getMonthType(siteIds,statisticsQueryDto);
- }
+ // 假设 chargingOrderService.getDateType() 返回的是按天的数据
+ List<Map<String, Object>> charMap1 = chargingOrderService.getDateType(siteIds, statisticsQueryDto);
+ // 解析 startTime 和 endTime 为 LocalDate
+ LocalDate startDate = statisticsQueryDto.getStartTime();
+ LocalDate endDate = statisticsQueryDto.getEndTime();
+
+ List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> dailyStats = findMapWithDateValue(charMap1, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("electrovalence", 0);
+ dateMap.put("orderCount", 0);
+ dateMap.put("servicecharge", 0);
+ dateMap.put("electricity", 0);
+ dateRangeStatistics.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusDays(1);
+ }
+
+// return dateRangeStatistics;
+ return R.ok(dateRangeStatistics);
+ }else if (statisticsQueryDto.getDayType()==3){
+ List<Map<String,Object>> charMap1 = chargingOrderService.getMonthType(siteIds,statisticsQueryDto);
+ // 解析 startTime 和 endTime 为 LocalDate
+ LocalDate startDate = statisticsQueryDto.getStartTime();
+ LocalDate endDate = statisticsQueryDto.getEndTime();
+
+ List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ Map<String, Object> dailyStats = findMapWithDateValue(charMap1, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("electrovalence", 0);
+ dateMap.put("orderCount", 0);
+ dateMap.put("servicecharge", 0);
+ dateMap.put("electricity", 0);
+ dateRangeStatistics.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusMonths(1);
+ }
+ return R.ok(dateRangeStatistics);
+
+ }
return R.ok();
}
+ private static Map<String, Object> findMapWithTimeValue(List<Map<String, Object>> charMap1,String timeValue) {
+ for (Map<String, Object> map : charMap1) {
+ if (map.containsKey("time") && map.get("time").equals(timeValue)) {
+ return map;
+ }
+ }
+ return null; // 如果没有找到，返回 null
+ }
+
+ private Map<String, Object> findMapWithDateValue(List<Map<String, Object>> list, String date) {
+ for (Map<String, Object> map : list) {
+ if (date.equals(map.get("time"))) {
+ return map;
+ }
+ }
+ return null;
+ }
+
+
+
+
@ResponseBody
@PostMapping(value = "/work/use")
- @ApiOperation(value = "运营情况", tags = {"管理后台-工作台"})
+ @ApiOperation(value = "利用率", tags = {"管理后台-工作台"})
public R workUse(@RequestBody ChargingDetailQueryDto statisticsQueryDto) {
List<Integer> siteIds = new ArrayList<>();
if (statisticsQueryDto.getSiteId() == null) {
@@ -1011,7 +1136,34 @@
BigDecimal result = chargingCapacity.divide(totalRatedPower, 2, RoundingMode.HALF_UP);
map.put("chargingCapacity", result);
});
- return R.ok(capMap);
+
+
+
+ //
+ // 解析 startTime 和 endTime 为 LocalDate
+ LocalDate startDate = statisticsQueryDto.getStartTime();
+ LocalDate endDate = statisticsQueryDto.getEndTime();
+
+ List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> dailyStats = findMapWithDateValue(capMap, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("chargingCapacity", 0);
+ dateRangeStatistics.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusDays(1);
+ }
+ return R.ok(dateRangeStatistics);
}
@@ -1019,9 +1171,9 @@
@Resource
private TOrderInvoiceService invoiceService;
@ResponseBody
- @PostMapping(value = "/work/shopOrder")
+ @GetMapping(value = "/work/shopOrder")
@ApiOperation(value = "购物订单统计", tags = {"管理后台-工作台"})
- public R shopOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
+ public R shopOrder() {
Long count = shoppingOrderService.lambdaQuery().eq(TShoppingOrder::getStatus, 1).count();
Long count1 = shoppingOrderService.lambdaQuery().eq(TShoppingOrder::getStatus, 2).count();
List<Long> counts = new ArrayList<>();
@@ -1031,9 +1183,9 @@
}
@ResponseBody
- @PostMapping(value = "/work/invoice")
+ @GetMapping(value = "/work/invoice")
@ApiOperation(value = "开票统计", tags = {"管理后台-工作台"})
- public R invoice(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
+ public R invoice() {
Long count = invoiceService.lambdaQuery().eq(TOrderInvoice::getStatus, 1).count();
Long count1 = invoiceService.lambdaQuery().eq(TOrderInvoice::getStatus, 3).count();
List<Long> counts = new ArrayList<>();
@@ -1043,9 +1195,9 @@
}
@ResponseBody
- @PostMapping(value = "/work/users/count")
+ @GetMapping(value = "/work/users/count")
@ApiOperation(value = "用户数量", tags = {"管理后台-工作台"})
- public R usersCount(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto) {
+ public R usersCount() {
List<Map<String,Object>> userMap = chargingOrderService.countAllUserData();
return R.ok(userMap);
--
Gitblit v1.7.1