changes

liuhaonan

2022-08-24 b2030052dda62a44875f751ff9fe061736988270

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.ListUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.CommonPage;
@@ -214,6 +213,8 @@
        int faultNumber = 0;
        //等待接入数量
        int waitConnectNumber = 0;
        //充电中数量
        int chargingNumber = 0;

        for (C3ChargingBo one : c3ChargingBoList) {
            String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
@@ -228,6 +229,7 @@
                            break;
                        //2.充电中
                        case 2:
                            chargingNumber++;
                            onlineNumber = onlineNumber + 1;
                            break;
                        //3.充电中断，等待服务器确认
@@ -269,6 +271,7 @@
        map.put("offlineNumber", offlineNumber);
        map.put("faultNumber", faultNumber);
        map.put("waitConnectNumber", waitConnectNumber);
        map.put("chargingNumber", chargingNumber);

        return map;
    }
@@ -317,7 +320,7 @@
            chargingDto.setC3Id(one.getC3Id());
            //C3Mac
            chargingDto.setC3Mac(one.getC3Mac());
            //在线状态
            //在线状态 1.空闲 2.充电中 3.充电中断，等待服务器确认 4.充电结束，等待服务器确认 5.有故障 6.与充电桩对接中
            chargingDto.setStatusBit(Integer.valueOf(beatDataPackage.getStatusBit()));
            //电压
            chargingDto.setGridVoltage(beatDataPackage.getGridVoltage());
@@ -329,6 +332,10 @@
            chargingDto.setPoleId(pole.getId());
            //费率
            BigDecimal bigDecimal = SpringContextHolder.getBean(C3mChargingChargeService.class).getchargeDecimalByC3id(one.getC3Id());
            //已充电量
            chargingDto.setChargedCapacity(beatDataPackage.getChargedCapacity());
            //充电时长
            chargingDto.setAlreadyChargingTime(beatDataPackage.getAlreadyChargingTime());
            chargingDto.setRate(bigDecimal);
        }

@@ -442,7 +449,7 @@
        if (order == null) {
            throw new BusinessException("充电桩没有进行中的订单");
        }
        if (!openId.equals(order.getOrderId())) {
        if (!openId.equals(order.getUserCode())) {
            throw new BusinessException("不能操作不属于您的订单");
        }