修改bug

Pu Zhibing

2025-01-24 18871fde6f2a648ee1672f6cfad73590ef2eaf46

修改bug

 ruoyi-service/ruoyi-integration/pom.xml

@@ -152,12 +152,12 @@
        <dependency>
            <groupId>com.huaweicloud.sdk</groupId>
            <artifactId>huaweicloud-sdk-core</artifactId>
            <version>[3.0.40-rc, 3.2.0)</version>
            <version>[3.0.40-rc,3.2.0)</version>
        </dependency>
        <dependency>
            <groupId>com.huaweicloud.sdk</groupId>
            <artifactId>huaweicloud-sdk-iotda</artifactId>
            <version>[3.0.40-rc, 3.2.0)</version>
            <version>[3.0.40-rc,3.2.0)</version>
        </dependency>
        <dependency>
            <groupId>com.huaweicloud.sdk</groupId>

 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;
@@ -1919,7 +1920,7 @@
        }
       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));

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -1489,8 +1489,6 @@
        </if>
        GROUP BY
            time
        ORDER BY
            time
    </select>
    <select id="countAllUserData" resultType="java.util.Map">
        SELECT