明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
puzhibing
2024-10-21 b87d5e26359383ef55446d3e66b5c45ac1730a43 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java


@@ -309,13 +309,14 @@


    @ResponseBody


    @PostMapping(value = "/chargingOrderInfo")


    @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})


    public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) {


        TChargingOrder byId = chargingOrderService.getById(orderId);


    public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String strategyId) {


        TChargingOrder byId = chargingOrderService.getById(strategyId);


        ChargingOrderInfoVO chargingOrderInfoVO = new ChargingOrderInfoVO();


        chargingOrderInfoVO.setCdElectronic(byId.getCurrent()+"");


        chargingOrderInfoVO.setCdVoltage(byId.getVoltage()+"");


        chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()+"");


        chargingOrderInfoVO.setTotalPower(byId.getPower()+"");




        chargingOrderInfoVO.setCdElectronic(byId.getCurrent()!=null?byId.getCurrent()+"":"");


        chargingOrderInfoVO.setCdVoltage(byId.getVoltage()!=null?byId.getVoltage()+"":"");


        chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()!=null?byId.getTotalElectricity()+"":"");


        chargingOrderInfoVO.setTotalPower(byId.getPower()!=null?byId.getPower()+"":"");


        if (byId.getAppUserCarId()!=null){


            List<TAppUserCar> data = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();


            if (!data.isEmpty()){


@@ -325,7 +326,7 @@


                chargingOrderInfoVO.setVehicleUse(data.get(0).getVehicleUse());


            }


        }


        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();


        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();


        chargingOrderInfoVO.setList(list);


        return AjaxResult.success(chargingOrderInfoVO);


    }


@@ -800,6 +801,7 @@


        }


        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());


        chargingOrderIds.add(-1l);


        //上方饼图


         List<Map<String,Object>> maps =   chargingOrderService.getSumByType(chargingOrderIds);