From 31e408fb7efa3b8352d420d3cb4dbf4ca7f1d47a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:46:44 +0800
Subject: [PATCH] 8.31
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 506 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 395 insertions(+), 111 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 f08ce69..f405a62 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,7 @@
package com.ruoyi.order.controller;
import java.math.BigDecimal;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -7,6 +9,7 @@
import com.ruoyi.account.api.feignClient.AppUserCarClient;
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;
@@ -17,11 +20,18 @@
import com.ruoyi.chargingPile.api.model.TParkingRecord;
import com.ruoyi.chargingPile.api.vo.SiteVO;
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.DateUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
+import com.ruoyi.integration.api.model.ChargingOrderAndUploadRealTimeMonitoringDataDto;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.query.TChargingCountQuery;
@@ -34,12 +44,15 @@
import com.ruoyi.order.dto.OrderEvaluateVo;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.*;
+import com.ruoyi.order.util.PreviousSixMonths;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.AliQueryOrder;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
+import jdk.nashorn.internal.runtime.ListAdapter;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -48,10 +61,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.util.Collections;
+import java.time.YearMonth;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAdjusters;
+import java.util.*;
import java.util.List;
-import java.util.Map;
-import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -72,18 +87,18 @@
private TokenService tokenService;
@Autowired
private TOrderEvaluateService orderEvaluateService;
-
+
@Resource
private WxPaymentClient wxPaymentClient;
-
+
@Resource
private RedisService redisService;
-
+
@Resource
private AliPaymentClient aliPaymentClient;
@Resource
private TShoppingOrderService shoppingOrderService;
-
+
@Autowired
private AppUserClient appUserClient;
@@ -91,62 +106,74 @@
private TVipOrderService vipOrderService;
@Resource
private ParkingLotClient parkingLotClient;
- @Resource private TChargingOrderRefundService chargingOrderRefundService;
+ @Resource
+ private TChargingOrderRefundService chargingOrderRefundService;
- @Resource private TShoppingOrderRefundService shoppingOrderRefundService;
- @Resource private TVipOrderRefundService vipOrderRefundService;
- @Resource private SiteClient siteClient;
- @Resource private ChargingPileClient chargingPileClient;
- @Resource private ChargingGunClient chargingGunClient;
- @Resource private AppUserCarClient appUserCarClient;
- @Resource private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
+ @Resource
+ private TShoppingOrderRefundService shoppingOrderRefundService;
+ @Resource
+ private TVipOrderRefundService vipOrderRefundService;
+ @Resource
+ private SiteClient siteClient;
+ @Resource
+ private ChargingPileClient chargingPileClient;
+ @Resource
+ private ChargingGunClient chargingGunClient;
+ @Resource
+ private AppUserCarClient appUserCarClient;
+ @Resource
+ private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
+
+
+
+
@ResponseBody
@PostMapping(value = "/pay/order/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
- public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto){
- return chargingOrderService.payOrderQuery(payOrderQueryDto);
+ public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) {
+ return chargingOrderService.payOrderQuery(payOrderQueryDto);
}
@ResponseBody
@GetMapping(value = "/pay/order/pay/detail")
@ApiOperation(value = "支付信息", tags = {"管理后台-支付订单-订单信息"})
- public R<PayOrderInfoDto> payOrderList(Long orderId,Integer type){
- switch (type){
- case 1:
- TChargingOrder byId = chargingOrderService.getById(orderId);
- PayOrderInfoDto payOrderInfoDto = new PayOrderInfoDto();
- payOrderInfoDto.setOrderId(byId.getId().toString());
- payOrderInfoDto.setCode(byId.getCode());
- payOrderInfoDto.setTradeNo(byId.getRechargeSerialNumber());
- payOrderInfoDto.setPayType(byId.getRechargePaymentType());
- payOrderInfoDto.setPayAmount(byId.getPaymentAmount());
- payOrderInfoDto.setPayTime(byId.getPayTime());
- payOrderInfoDto.setRefundAmount(byId.getRefundAmount());
- return R.ok(payOrderInfoDto);
- case 2:
- TShoppingOrder byId1 = shoppingOrderService.getById(orderId);
- PayOrderInfoDto payOrderInfoDto1 = new PayOrderInfoDto();
- payOrderInfoDto1.setOrderId(byId1.getId().toString());
- payOrderInfoDto1.setCode(byId1.getCode());
- payOrderInfoDto1.setTradeNo(byId1.getSerialNumber());
- payOrderInfoDto1.setPayType(byId1.getPaymentType());
- payOrderInfoDto1.setPayAmount(byId1.getPaymentAmount());
- payOrderInfoDto1.setPayTime(byId1.getPayTime());
- payOrderInfoDto1.setRefundAmount(byId1.getRefundAmount());
- return R.ok(payOrderInfoDto1);
- case 3 :
- TVipOrder byId2 = vipOrderService.getById(orderId);
- PayOrderInfoDto payOrderInfoDto2 = new PayOrderInfoDto();
- payOrderInfoDto2.setOrderId(byId2.getId().toString());
- payOrderInfoDto2.setCode(byId2.getCode());
- payOrderInfoDto2.setTradeNo(byId2.getSerialNumber());
- payOrderInfoDto2.setPayType(byId2.getPaymentType());
- payOrderInfoDto2.setPayAmount(byId2.getPaymentAmount());
- payOrderInfoDto2.setPayTime(byId2.getPayTime());
- payOrderInfoDto2.setRefundAmount(byId2.getRefundAmount());
- return R.ok(payOrderInfoDto2);
- //todo luo 停车场订单
+ public R<PayOrderInfoDto> payOrderList(Long orderId, Integer type) {
+ switch (type) {
+ case 1:
+ TChargingOrder byId = chargingOrderService.getById(orderId);
+ PayOrderInfoDto payOrderInfoDto = new PayOrderInfoDto();
+ payOrderInfoDto.setOrderId(byId.getId().toString());
+ payOrderInfoDto.setCode(byId.getCode());
+ payOrderInfoDto.setTradeNo(byId.getRechargeSerialNumber());
+ payOrderInfoDto.setPayType(byId.getRechargePaymentType());
+ payOrderInfoDto.setPayAmount(byId.getPaymentAmount());
+ payOrderInfoDto.setPayTime(byId.getPayTime());
+ payOrderInfoDto.setRefundAmount(byId.getRefundAmount());
+ return R.ok(payOrderInfoDto);
+ case 2:
+ TShoppingOrder byId1 = shoppingOrderService.getById(orderId);
+ PayOrderInfoDto payOrderInfoDto1 = new PayOrderInfoDto();
+ payOrderInfoDto1.setOrderId(byId1.getId().toString());
+ payOrderInfoDto1.setCode(byId1.getCode());
+ payOrderInfoDto1.setTradeNo(byId1.getSerialNumber());
+ payOrderInfoDto1.setPayType(byId1.getPaymentType());
+ payOrderInfoDto1.setPayAmount(byId1.getPaymentAmount());
+ payOrderInfoDto1.setPayTime(byId1.getPayTime());
+ payOrderInfoDto1.setRefundAmount(byId1.getRefundAmount());
+ return R.ok(payOrderInfoDto1);
+ case 3:
+ TVipOrder byId2 = vipOrderService.getById(orderId);
+ PayOrderInfoDto payOrderInfoDto2 = new PayOrderInfoDto();
+ payOrderInfoDto2.setOrderId(byId2.getId().toString());
+ payOrderInfoDto2.setCode(byId2.getCode());
+ payOrderInfoDto2.setTradeNo(byId2.getSerialNumber());
+ payOrderInfoDto2.setPayType(byId2.getPaymentType());
+ payOrderInfoDto2.setPayAmount(byId2.getPaymentAmount());
+ payOrderInfoDto2.setPayTime(byId2.getPayTime());
+ payOrderInfoDto2.setRefundAmount(byId2.getRefundAmount());
+ return R.ok(payOrderInfoDto2);
+ //todo luo 停车场订单
// case 4:
// TParkingRecord byId3 = parkingLotClient.getRecordById(orderId).getData();
// PayOrderInfoDto payOrderInfoDto3 = new PayOrderInfoDto();
@@ -159,16 +186,15 @@
// payOrderInfoDto3.setRefundAmount(new BigDecimal("0"));
-
-
- }
+ }
return R.ok();
}
+
@ResponseBody
@GetMapping(value = "/pay/order/refund/detail")
@ApiOperation(value = "退款信息", tags = {"管理后台-支付订单-订单信息"})
- public R refundDetail(Long orderId,Integer type){
+ public R refundDetail(Long orderId, Integer type) {
switch (type) {
case 1:
List<TChargingOrderRefund> byId = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, orderId).orderByDesc(TChargingOrderRefund::getRefundTime).list();
@@ -188,7 +214,7 @@
@ResponseBody
@GetMapping(value = "/pay/order/charging")
@ApiOperation(value = "充电信息", tags = {"管理后台-支付订单-订单信息"})
- public R refundDetail(Long orderId){
+ public R refundDetail(Long orderId) {
PayOrderChargingInfo payOrderChargingInfo = new PayOrderChargingInfo();
TChargingOrder byId = chargingOrderService.getById(orderId);
List<Site> data = siteClient.getSiteByIds(Collections.singletonList(byId.getSiteId())).getData();
@@ -201,41 +227,39 @@
payOrderChargingInfo.setCarNum(data3.get(0).getLicensePlate());
return R.ok();
}
+
@ResponseBody
@GetMapping(value = "/pay/order/charging/details")
@ApiOperation(value = "充电明细", tags = {"管理后台-支付订单-订单信息"})
- public R<List<TChargingOrderAccountingStrategy>> chargingDetail(Long orderId){
+ public R<List<TChargingOrderAccountingStrategy>> chargingDetail(Long orderId) {
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
return R.ok(list);
}
-
@ResponseBody
@PostMapping(value = "/pay/order/refund/list")
@ApiOperation(value = "充电信息", tags = {"管理后台-支付订单-退款订单"})
- public R<PageInfo<TChargingOrderRefund>> refundList(@RequestBody ChargingRefundDto chargingRefundDto){
- return chargingOrderService.getRefundList(chargingRefundDto);
+ public R<PageInfo<TChargingOrderRefund>> refundList(@RequestBody ChargingRefundDto chargingRefundDto) {
+ return chargingOrderService.getRefundList(chargingRefundDto);
}
-
-
-
@ResponseBody
@PostMapping(value = "/chargingOrder")
@ApiOperation(value = "充电桩订单列表", tags = {"管理后台-订单管理"})
- public AjaxResult<TCharingOrderVO> chargingOrder(@RequestBody ChargingOrderQuery dto){
+ public AjaxResult<TCharingOrderVO> chargingOrder(@RequestBody ChargingOrderQuery dto) {
List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
dto.setUserIds(data);
TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
return AjaxResult.success(res);
}
+
@ResponseBody
@PostMapping(value = "/chargingOrderInfo")
@ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
- public AjaxResult<TCharingOrderVO> chargingOrderInfo(String orderId){
+ public AjaxResult<TCharingOrderVO> chargingOrderInfo(String orderId) {
return AjaxResult.success();
}
@@ -243,11 +267,12 @@
@ResponseBody
@PostMapping(value = "/addEvaluate")
@ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"})
- public AjaxResult getMyChargingOrderList(@RequestBody OrderEvaluateVo dto){
+ public AjaxResult getMyChargingOrderList(@RequestBody OrderEvaluateVo dto) {
dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
orderEvaluateService.addOrderEvaluate(dto);
return AjaxResult.success();
}
+
/**
* 查询用户最近一次充电记录使用的车辆
* @param
@@ -258,11 +283,11 @@
List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
.eq(TChargingOrder::getAppUserId, tokenService.getLoginUserApplet().getUserId())
.isNotNull(TChargingOrder::getAppUserCarId));
- if (!list.isEmpty()){
+ if (!list.isEmpty()) {
// 最近使用的车辆id
Long size = list.get(0).getAppUserCarId();
return R.ok(size);
- }else{
+ } else {
return R.ok(-1L);
}
}
@@ -276,10 +301,11 @@
public R<Integer> getChargingCount(@RequestBody TChargingCountQuery req) {
int size = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>()
.eq(TChargingOrder::getAppUserId, req.getUserId())
- .eq(TChargingOrder::getRechargePaymentStatus,2)
+ .eq(TChargingOrder::getRechargePaymentStatus, 2)
.between(TChargingOrder::getStartTime, req.getStartTime(), req.getEndTime())).size();
return R.ok(size);
}
+
//用户订单数量
@PostMapping(value = "/useOrderCount")
public R<Long> useOrderCount(@RequestParam("userId") Long userId) {
@@ -287,142 +313,400 @@
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) {
+
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getSiteId, siteId).list();
+ 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 chargingGunId 充电枪id
* @return
*/
@PostMapping(value = "/getOrderDetailByGunId")
- public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId){
+ public R<TChargingOrder> getOrderDetailByGunId(@RequestParam("chargingGunId") Integer chargingGunId) {
TChargingOrder one = chargingOrderService.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, chargingGunId)
.eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
return R.ok(one);
}
-
-
-
-
+
+
@ResponseBody
@GetMapping(value = "/getMyChargingOrderList")
@ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
- public AjaxResult<Map<String, Object>> getMyChargingOrderList(GetMyChargingOrderList query){
+ public AjaxResult<Map<String, Object>> getMyChargingOrderList(GetMyChargingOrderList query) {
Map<String, Object> orderList = chargingOrderService.getMyChargingOrderList(query);
return AjaxResult.success(orderList);
}
-
-
+
+
@ResponseBody
@GetMapping(value = "/getMyChargingOrderInfo")
@ApiOperation(value = "获取充电记订单明细", tags = {"小程序-充电记录"})
- public AjaxResult<MyChargingOrderInfo> getMyChargingOrderInfo(String id){
+ public AjaxResult<MyChargingOrderInfo> getMyChargingOrderInfo(String id) {
MyChargingOrderInfo myChargingOrderInfo = chargingOrderService.getMyChargingOrderInfo(id);
return AjaxResult.success(myChargingOrderInfo);
}
-
-
-
+
+
@ResponseBody
@GetMapping(value = "/getNoInvoicedOrder")
@ApiOperation(value = "获取未开票的订单数据", tags = {"小程序-充电发票"})
- public AjaxResult<List<MyChargingOrderList>> getNoInvoicedOrder(GetNoInvoicedOrder query){
+ public AjaxResult<List<MyChargingOrderList>> getNoInvoicedOrder(GetNoInvoicedOrder query) {
List<MyChargingOrderList> list = chargingOrderService.getNoInvoicedOrder(query);
return AjaxResult.success(list);
}
-
-
-
+
+
@ResponseBody
@PostMapping(value = "/paymentChargingOrder")
@ApiOperation(value = "支付充电充值费用", tags = {"小程序-扫一扫"})
- public AjaxResult paymentChargingOrder(@RequestBody AddChargingOrder addChargingOrder){
+ public AjaxResult paymentChargingOrder(@RequestBody AddChargingOrder addChargingOrder) {
return chargingOrderService.paymentChargingOrder(addChargingOrder);
}
-
+
/**
* 充电充值支付回调
* @param request
*/
@ResponseBody
@PostMapping(value = "/chargingOrderWXCallback")
- public void chargingOrderWXCallback(HttpServletRequest request){
+ public void chargingOrderWXCallback(HttpServletRequest request) {
Map<String, Object> data = wxPaymentClient.payNotify(request).getData();
- if(null != data){
+ 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()){
+ if (ajaxResult.isSuccess()) {
wxPaymentClient.ack();
}
}
}
-
-
+
+
/**
* 支付宝支付成功后的回调
*/
@ResponseBody
@PostMapping(value = "/chargingOrderALICallback")
- public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response){
+ public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response) {
try {
String out_trade_no = aliQueryOrder.getOutTradeNo();
String transaction_id = aliQueryOrder.getTradeNo();
String attach = aliQueryOrder.getPassbackParams();
AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
- if(ajaxResult.isSuccess()){
+ if (ajaxResult.isSuccess()) {
PrintWriter writer = response.getWriter();
writer.println("success");
writer.flush();
writer.close();
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
-
-
-
+
+
@ResponseBody
@GetMapping(value = "/preChargeCheck/{id}")
@ApiOperation(value = "获取安全检测数据", tags = {"小程序-扫一扫"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "充电枪id", required = true)
})
- public AjaxResult<PreChargeCheck> preChargeCheck(@PathVariable Integer id){
+ public AjaxResult<PreChargeCheck> preChargeCheck(@PathVariable Integer id) {
String key = "AQJC_" + id;
Object cacheObject = redisService.getCacheObject(key);
return AjaxResult.success(cacheObject);
}
-
-
-
+
+
@ResponseBody
@GetMapping(value = "/getChargingDetails/{id}")
@ApiOperation(value = "获取充电中页面数据", tags = {"小程序-扫一扫"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "充电枪id", required = true)
})
- public AjaxResult<ChargingDetails> getChargingDetails(@PathVariable Integer id){
+ public AjaxResult<ChargingDetails> getChargingDetails(@PathVariable Integer id) {
ChargingDetails chargingDetails = chargingOrderService.getChargingDetails(id);
return AjaxResult.success(chargingDetails);
}
-
-
-
+
+
@ResponseBody
@PutMapping(value = "/stopCharging/{id}")
@ApiOperation(value = "手动停止充电", tags = {"小程序-扫一扫"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "订单id", required = true)
})
- public AjaxResult stopCharging(@PathVariable String id){
+ public AjaxResult stopCharging(@PathVariable String id) {
return chargingOrderService.stopCharging(id);
}
-}
+ @ResponseBody
+ @GetMapping(value = "/six/charge")
+ @ApiOperation(value = "电站收入分析", tags = {"后台-数据分析-平台收入分析"})
+ public R<List<SixChargingDto>> charge(Integer siteId) {
+ Long userId = SecurityUtils.getUserId();
+ //如果没传siteId,获取当前登陆人所有的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ if (siteId==null){
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ }else {
+ siteIds.add(siteId);
+ }
+ LocalDate sixBefore = PreviousSixMonths.get();
+ //通过siteIds进行sql查询统计
+ List<SixChargingDto> chargingDtos = chargingOrderService.charge(sixBefore, siteIds);
+
+ return R.ok(chargingDtos);
+
+ }
+
+ @ResponseBody
+ @GetMapping(value = "/six/circle")
+ @ApiOperation(value = "电站收入占比", tags = {"后台-数据分析-平台收入分析"})
+ public R<List<SixCircleDto>> circle() {
+ Long userId = SecurityUtils.getUserId();
+ //获取当前登录的siteIds
+ List<Integer> siteIds = new ArrayList<>();
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
+ //进行统计groupBySiteId
+ LocalDate sixBefore = PreviousSixMonths.get();
+
+ List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore);
+ for (SixCircleDto sixCircleDto : sixCircleDtos) {
+ Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
+ sixCircleDto.setSiteName(site.getName());
+ }
+ return R.ok(sixCircleDtos);
+
+ }
+
+
+ @ResponseBody
+ @GetMapping(value = "/six/shop")
+ @ApiOperation(value = "购物收入", tags = {"后台-数据分析-平台收入分析"})
+ public R<List<SixShopDto>> shop(Integer status) {
+ //count近6个月的数据
+ LocalDate sixBefore = PreviousSixMonths.get();
+ List<SixShopDto> sixShopDtos = shoppingOrderService.sixBefore(sixBefore,status);
+ return R.ok(sixShopDtos);
+ }
+
+ @ResponseBody
+ @GetMapping(value = "/six/vip")
+ @ApiOperation(value = "vip收入", tags = {"后台-数据分析-平台收入分析"})
+ public R<List<SixVipDto>> vip() {
+ //count近6个月的数据
+ LocalDate sixBefore = PreviousSixMonths.get();
+ List<SixVipDto> vipDtos = vipOrderService.sixBefore(sixBefore);
+ return R.ok(vipDtos);
+ }
+
+ @ResponseBody
+ @GetMapping(value = "/six/total")
+ @ApiOperation(value = "底部数据分类", tags = {"后台-数据分析-平台收入分析"})
+ public R<Map<String,BigDecimal>> total() {
+ //count近6个月的数据
+ LocalDate sixBefore = PreviousSixMonths.get();
+ Map<String,BigDecimal> map = chargingOrderService.countAll(sixBefore);
+ BigDecimal data = parkingLotClient.getRecordAmount(sixBefore).getData();
+ map.put("parkingAmount",data);
+ BigDecimal data1 = shoppingOrderService.getSumAmount(sixBefore);
+ map.put("shopAmount",data1);
+ BigDecimal data2 = vipOrderService.getSumAmout(sixBefore);
+ map.put("vipAmount",data2);
+
+ return R.ok(map);
+ }
+
+ @Resource
+ private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+ @ResponseBody
+ @PostMapping(value = "/watch/chargingOrder")
+ @ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"})
+ public AjaxResult<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingOrderQuery dto) {
+ Integer page = dto.getPageCurr();
+ Integer pageSize = dto.getPageSize();
+ List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
+ dto.setUserIds(data);
+ dto.setPageCurr(1);
+ dto.setPageSize(99999);
+ TCharingOrderVO res = chargingOrderService.chargingOrder(dto);
+ Map<String,TChargingOrder> map = new HashMap<>();
+ //吧list放入map中
+ for (ChargingOrderVO record : res.getList().getRecords()) {
+ map.put(record.getCode(),record);
+ }
+ Set<String> strings = map.keySet();
+
+
+ List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(strings, page, pageSize).getData();
+
+ List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data1) {
+ ChargingOrderAndUploadRealTimeMonitoringDataDto dataDto = new ChargingOrderAndUploadRealTimeMonitoringDataDto();
+ BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);
+ BeanUtils.copyProperties(map.get(uploadRealTimeMonitoringData.getCharging_pile_code()),dataDto);
+ dtos.add(dataDto);
+ }
+
+
+ return AjaxResult.success(res);
+ }
+
+
+
+
+// @ResponseBody
+// @PostMapping(value = "/charging/statistics")
+// @ApiOperation(value = "统计", tags = {"管理后台-数据分析-充电运营分析"})
+// public R<TCharingOrderVO> watchChargingOrder(@RequestBody ChargingStatisticsQueryDto statisticsQueryDto){
+// List<Integer> siteIds =new ArrayList<>();
+// if (statisticsQueryDto.getSiteId()==null) {
+// Long userId = SecurityUtils.getUserId();
+// //获取当前登录的siteIds
+// List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+// for (GetSiteListDTO datum : data) {
+// siteIds.add(datum.getId());
+// }
+// }else {
+// siteIds.add(statisticsQueryDto.getSiteId());
+// }
+//
+//
+// LocalDate start = null;
+// LocalDate end = null;
+// if (statisticsQueryDto.getDayType()==1){
+// start = LocalDate.now();
+//
+// }else if (statisticsQueryDto.getDayType()==2){
+// LocalDate today = LocalDate.now();
+//
+// // 获取本周一的日期
+// LocalDate mondayThisWeek = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+//
+// System.out.println("本周一是: " + mondayThisWeek);
+// }
+// else if (statisticsQueryDto.getDayType()==3){
+// // 获取当前日期
+// LocalDate today = LocalDate.now();
+//
+// // 获取本月1号的日期
+// YearMonth yearMonth = YearMonth.from(today);
+// start = yearMonth.atDay(1);
+//
+// System.out.println("本月1号是: " + start);
+// }else if (statisticsQueryDto.getDayType()==4){
+// LocalDate today = LocalDate.now();
+// // 获取当前年份
+// int currentYear = today.getYear();
+// // 获取今年1月1日的日期
+// start = LocalDate.of(currentYear, 1, 1);
+// System.out.println("今年1月1日是: " + start);
+// }else if (statisticsQueryDto.getDayType()==5){
+//
+// // 获取今年1月1日的日期
+// start = statisticsQueryDto.getStartTime();
+// end = statisticsQueryDto.getEndTime();
+// }
+// List<TChargingOrder> list = chargingOrderService.lambdaQuery().ge(TChargingOrder::getStartTime, start).le(TChargingOrder::getEndTime, end).in(TChargingOrder::getSiteId, siteIds).list();
+// List<Long> chargingOrderIds = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
+// //上方饼图
+// List<Map<String,BigDecimal>> maps = chargingOrderService.getSumByType(chargingOrderIds);
+//
+// if (statisticsQueryDto.getDayType()==1){
+// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getDateData(chargingOrderIds);
+//
+// }else if (statisticsQueryDto.getDayType()==2){
+// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getWeekData(chargingOrderIds);
+// }else if (statisticsQueryDto.getDayType()==3){
+// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getMonthData(chargingOrderIds);
+// }else if (statisticsQueryDto.getDayType()==4){
+// List<Map<String,BigDecimal>> maps1 = chargingOrderService.getYearData(chargingOrderIds);
+// }
+//
+//
+//
+//
+//
+//
+// }
+
+ public static void main(String[] args) {
+ // 示例数据
+ List<TChargingOrder> list = getSampleData();
+ System.err.println(list);
+ List<Map<String, BigDecimal>> result = processData(list);
+
+ result.forEach(System.out::println);
+ }
+
+
+ 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;
+ }
+
+}
--
Gitblit v1.7.1