From 15dcbd07dfb421e81bf2401cc37b8a6bca6d4211 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 十月 2025 18:34:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 474 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 300 insertions(+), 174 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 faa6696..0c89614 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,5 +1,6 @@
package com.ruoyi.order.controller;
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.math.BigDecimal;
@@ -24,6 +25,9 @@
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.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -36,6 +40,7 @@
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.ChargingOrderAndUploadRealTimeMonitoringDataDto;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData;
+import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.common.core.dto.MongoChargingOrderQuery;
@@ -53,7 +58,10 @@
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.*;
import com.ruoyi.order.util.PreviousSixMonths;
+import com.ruoyi.order.util.mongodb.service.UploadRealTimeMonitoringDataService;
import com.ruoyi.order.vo.EndOfChargePageInfo;
+import com.ruoyi.order.vo.StatisticsOfBatteryVO;
+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 +71,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;
@@ -146,7 +151,7 @@
@Resource
private TOrderInvoiceService invoiceService;
@Resource
- private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+ private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@Resource
private PartnerClient partnerClient;
@Resource
@@ -159,10 +164,25 @@
private RoleSiteClient roleSiteClient;
@Resource
private SysUserRoleClient sysUserRoleClient;
-
-
-
-
+
+
+
+ /**
+ * 远程调用 监管平台查询前一天用能统计
+ * @return
+ */
+ @ResponseBody
+ @PostMapping(value = "/getChargingStatistics")
+ public R<List<TChargingOrder>> getChargingStatistics(@RequestBody ChargingStatisticeDTO dto) {
+ List<Long> collect = chargingOrderAccountingStrategyService.lambdaQuery().between(TChargingOrderAccountingStrategy::getCreateTime, dto.getStartTime(), dto.getEndTime())
+ .list().stream().map(TChargingOrderAccountingStrategy::getChargingOrderId).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery()
+ .in(TChargingOrder::getId,collect).list();
+ return R.ok(list);
+ }
+ return R.ok(new ArrayList<TChargingOrder>());
+ }
/**
* 远程调用 增加管理后台赠送会员记录
@@ -202,55 +222,36 @@
@PostMapping(value = "/pay/order/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto 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);
- }
+ return chargingOrderService.payOrderQuery(payOrderQueryDto);
- }
- List<PayOrderDto> res1 = testing5(res.size(), pageCurr, pageSize, res);
- data.setTotal(res.size());
- data.setRecords(res1);
- return R.ok(data);
+// 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);
}
@@ -624,10 +625,11 @@
chargingOrderInfoVO.setList(list);
return AjaxResult.success(chargingOrderInfoVO);
}
-
+
+ @Log(title = "【扫一扫】添加评价", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ResponseBody
@PostMapping(value = "/addEvaluate")
@ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"})
@@ -780,7 +782,7 @@
}
-
+ @Log(title = "【扫一扫】支付充电充值费用", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
@ResponseBody
@PostMapping(value = "/paymentChargingOrder")
@ApiOperation(value = "支付充电充值费用", tags = {"小程序-扫一扫"})
@@ -833,7 +835,17 @@
@RequestParam("attach") String attach) {
chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
}
-
+ /**
+ * 支付宝H5支付成功后的回调
+ */
+ @ResponseBody
+ @PostMapping(value = "/chargingOrderALIH5Callback")
+ public void chargingOrderALIH5Callback(@RequestParam("out_trade_no") String out_trade_no,
+ @RequestParam("transaction_id") String transaction_id,
+ @RequestParam("attach") String attach) {
+ chargingOrderService.chargingOrderCallback(3, out_trade_no, transaction_id, attach);
+ }
+
/**
*
@@ -845,6 +857,19 @@
chargingOrderService.refund(code);
return R.ok();
}
+
+
+ /**
+ *
+ * @param code
+ */
+ @ResponseBody
+ @PostMapping(value = "/refund1")
+ public R refund1(@RequestParam(value = "code") String code, @RequestParam(value = "money") BigDecimal money){
+ chargingOrderService.refund1(code, money);
+ return R.ok();
+ }
+
/**
@@ -861,8 +886,7 @@
-
-
+
@ResponseBody
@GetMapping(value = "/preChargeCheck/{id}")
@ApiOperation(value = "获取安全检测数据", tags = {"小程序-扫一扫"})
@@ -876,7 +900,6 @@
}
-
@ResponseBody
@GetMapping(value = "/getChargingDetails/{id}")
@ApiOperation(value = "获取充电中页面数据", tags = {"小程序-扫一扫"})
@@ -887,8 +910,8 @@
ChargingDetails chargingDetails = chargingOrderService.getChargingDetails(id);
return AjaxResult.success(chargingDetails);
}
-
-
+
+ @Log(title = "【扫一扫】手动停止充电", businessType = BusinessType.STOP,operatorType = OperatorType.MOBILE)
@ResponseBody
@PutMapping(value = "/stopCharging/{id}")
@ApiOperation(value = "手动停止充电", tags = {"小程序-扫一扫"})
@@ -896,6 +919,7 @@
@ApiImplicitParam(name = "id", value = "订单id", required = true)
})
public AjaxResult stopCharging(@PathVariable String id) {
+ log.info("小程序主动发起停止充电，订单ID：{}", id);
return chargingOrderService.stopCharging(id);
}
@@ -1077,6 +1101,7 @@
public R<Map<String,Object>> total() {
//count近6个月的数据
Long userId = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
//获取当前登录的siteIds
List<Integer> siteIds = new ArrayList<>();
List<GetSiteListDTO> data9 = siteClient.getSiteListByUserId(userId).getData();
@@ -1088,17 +1113,23 @@
siteIds.add(-1);
}
Map<String,Object> map = chargingOrderService.countAll(siteIds);
- BigDecimal data = parkingLotClient.getRecordAmount().getData();
- if (map ==null){
- map = new HashMap<String,Object>();
+ if(1 == sysUser.getObjectId()){
+ BigDecimal data = parkingLotClient.getRecordAmount().getData();
+ if (map ==null){
+ map = new HashMap<String,Object>();
+ }
+ map.put("parkingAmount",data);
+ BigDecimal data1 = shoppingOrderService.getSumAmount();
+ map.put("shopAmount",data1);
+ BigDecimal data2 = vipOrderService.getSumAmout();
+ map.put("vipAmount",data2);
+ }else{
+ map.put("parkingAmount",0);
+ map.put("shopAmount",0);
+ map.put("vipAmount",0);
}
- map.put("parkingAmount",data);
- BigDecimal data1 = shoppingOrderService.getSumAmount();
- map.put("shopAmount",data1);
- BigDecimal data2 = vipOrderService.getSumAmout();
- map.put("vipAmount",data2);
List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getStatus, 5).eq(TChargingOrder::getDelFlag, 0)
- .eq(TChargingOrder::getRechargePaymentStatus, 2).list();
+ .eq(TChargingOrder::getRechargePaymentStatus, 2).in(TChargingOrder::getSiteId, siteIds).list();
BigDecimal sharingAmount = BigDecimal.ZERO;
BigDecimal commissionAmount = BigDecimal.ZERO;
//计算list中electrovalence的总和
@@ -1175,23 +1206,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);
}
@@ -1200,7 +1245,7 @@
@GetMapping(value = "/watch/deletes")
@ApiOperation(value = "监控订单-删除", tags = {"管理后台-订单管理"})
public R watchChargingOrder(@RequestParam String id) {
- uploadRealTimeMonitoringDataClient.delete(id);
+ uploadRealTimeMonitoringDataService.delete(id);
return R.ok();
}
@@ -1219,8 +1264,10 @@
*/
@PostMapping(value = "/getOrderByCode/{code}")
public R<TChargingOrder> getOrderByCode(@PathVariable("code") String code){
- return R.ok(chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
- .eq(TChargingOrder::getCode,code)));
+ TChargingOrder one = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getCode, code));
+ one.setIdStr(one.getId().toString());
+ return R.ok(one);
}
@@ -1264,7 +1311,6 @@
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
}else if (statisticsQueryDto.getDayType()==5){
- // 获取今年1月1日的日期
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
if (start.equals(end)){
@@ -1429,7 +1475,10 @@
BigDecimal commissionAmount = BigDecimal.ZERO;
for (Map<String, Object> map : maps) {
BigDecimal periodElectricPrice = (BigDecimal) map.get("period_electric_price");
- allMoney = allMoney.add(periodElectricPrice);
+ Long order_source = (Long)map.get("order_source");
+ if(2 != order_source){
+ allMoney = allMoney.add(periodElectricPrice);
+ }
BigDecimal total_amount = (BigDecimal) map.get("total_amount");
allMoney = allMoney.add(total_amount);
commissionAmount = commissionAmount.add((BigDecimal) map.get("commissionAmount"));
@@ -1898,100 +1947,104 @@
@PostMapping(value = "/work/chargeDetail")
@ApiOperation(value = "运营情况", tags = {"管理后台-工作台"})
public R workCharge(@RequestBody ChargingDetailQueryDto statisticsQueryDto) {
- List<Integer> siteIds = new ArrayList<>();
- if (statisticsQueryDto.getSiteId() == null) {
- Long userId = tokenService.getLoginUser().getUserid();
- //获取当前登录的siteIds
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
- } else {
- siteIds.add(statisticsQueryDto.getSiteId());
- }
- if (statisticsQueryDto.getDayType()==1) {
- 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);
+ try {
+ List<Integer> siteIds = new ArrayList<>();
+ if (statisticsQueryDto.getSiteId() == null) {
+ Long userId = tokenService.getLoginUser().getUserid();
+ //获取当前登录的siteIds
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
}
+ } else {
+ siteIds.add(statisticsQueryDto.getSiteId());
}
- return R.ok(charMap);
- }else if (statisticsQueryDto.getDayType()==2){
- // 假设 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);
+ if (statisticsQueryDto.getDayType()==1) {
+ 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);
+ }
}
-
- // 移动到下一天
- startDate = startDate.plusDays(1);
- }
+ return R.ok(charMap);
+ }else if (statisticsQueryDto.getDayType()==2){
+ // 假设 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);
+ 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);
}
-
- // 移动到下一天
- startDate = startDate.plusMonths(1);
+ return R.ok(dateRangeStatistics);
+
}
- return R.ok(dateRangeStatistics);
-
+ }catch (Exception e){
+ e.printStackTrace();
}
return R.ok();
@@ -2289,6 +2342,79 @@
return chargingOrderService.getNotPaymentChargingOrder();
}
-
+ /**
+ * 手动推送订单给三方平台
+ * @param code
+ * @return
+ */
+ @PostMapping("/pushOrderInfo")
+ public R pushOrderInfo(@RequestParam String code){
+ return chargingOrderService.pushOrderInfo(code);
+ }
+
+
+ /**
+ * 添加汇总数据（临时）
+ * @return
+ */
+ @ResponseBody
+ @GetMapping(value = "/addChargingOrderSummaryData")
+ public R addChargingOrderSummaryData(){
+ return chargingOrderService.addChargingOrderSummaryData();
+ }
+
+ /**
+ * 充电桩数据大屏 新能源汽车电池安全检测次数统计
+ */
+ @ResponseBody
+ @GetMapping(value = "/getStatisticsOfBattery")
+ @ApiOperation(value = "新能源汽车电池安全检测次数统计", tags = {"充电桩数据大屏"})
+ public R<StatisticsOfBatteryVO> getStatisticsOfBattery(){
+
+ return chargingOrderService.getStatisticsOfBattery();
+ }
+
+ /**
+ * 充电桩数据大屏 获取站点集合中总的充电量
+ */
+ @ResponseBody
+ @GetMapping("/getSumDegreeBySiteIds")
+ public R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds){
+ Double sumDegreeBySiteIds = chargingOrderService.getSumDegreeBySiteIds(SiteIds);
+
+ return R.ok(new BigDecimal(sumDegreeBySiteIds));
+ }
+
+
+ @GetMapping(value = "/getOrderIdByUserId")
+ @ApiOperation(value = "H5查询当前用户正在充电中的订单id集合", tags = {"H5-首页-用户充电订单信息"})
+ public R<String> getOrderIdByUserId() {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getAppUserId, userId)
+ .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4))
+ .orderByDesc(TChargingOrder::getCreateTime)
+ .last("LIMIT 1"));
+ if(Objects.isNull(chargingOrder)){
+ return R.ok();
+ }
+ return R.ok(String.valueOf(chargingOrder.getId()));
+ }
+
+// @GetMapping(value = "/getOrderByCode")
+// @ApiOperation(value = "H5通过编号查询订单", tags = {"H5-首页-用户充电订单信息"})
+// public R<String> getOrderByCode(@RequestParam("code") String code) {
+// Long userId = tokenService.getLoginUserApplet().getUserId();
+// TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
+// .eq(TChargingOrder::getAppUserId, userId)
+// .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4))
+// .orderByDesc(TChargingOrder::getCreateTime)
+// .last("LIMIT 1"));
+// if(Objects.isNull(chargingOrder)){
+// return R.ok();
+// }
+// return R.ok(String.valueOf(chargingOrder.getId()));
+// }
+
}
--
Gitblit v1.7.1