fix

zhanzhiqin

2022-04-14 8fa5a6dd8045fb298e391498e2ef2cd904dade45

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

@@ -18,11 +18,13 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.C3ChargingAddParam;
import com.sandu.ximon.admin.param.C3ChargingParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.C3ChargingBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mChargingCharge;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.C3mChargingMapper;
import lombok.AllArgsConstructor;
@@ -56,7 +58,7 @@
    public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) {
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getPoleDevicesCode, deviceName));
        if (one != null) {
            one.setStatusBit(Integer.valueOf(statusBit));
//            one.setStatusBit(Integer.valueOf(statusBit));
            one.setDeviceTemperature(deviceTemperature);
            one.setPoleDevicesCode(deviceName);
            one.setC3Mac(c3Mac);
@@ -91,6 +93,15 @@
            List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
            if (list.size() == 0) {//费率表中没有此充电桩数据时  添加默认费率
                c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
            }

            //添加绑定关系
            Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
            if(pole != null){
                PoleBindingParam poleBindingParam = new PoleBindingParam();
                poleBindingParam.setDeviceType(2);
                poleBindingParam.setDeviceCode(mcuUdid);
                bindingService.bindPole(pole.getId(), poleBindingParam);
            }

        } else {
@@ -131,7 +142,7 @@
         * 获取心跳包，判断在线
         */
        A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = ReadTheHeartbeatPackage(c3Mac);
        if(aPackage == null){
        if (aPackage == null) {
            LogUtils.error("读取心跳包为空");
            return false;
        }
@@ -147,7 +158,7 @@
         */
        String end = EndOfTheSynchronization(c3Mac);
        if (!"操作成功".equals(end)) {
            LogUtils.error("C3同步结束响应结果"+end);
            LogUtils.error("C3同步结束响应结果" + end);
            return false;
        }
        return flag;
@@ -169,10 +180,34 @@
            c3ChargingParam.setKeyword(c3ChargingParam.getKeyword().trim());
        }

        List<C3ChargingBo> c3ChargingBoList
                = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword());
        List<C3ChargingBo> c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(c3ChargingParam.getKeyword());
        for (C3ChargingBo one : c3ChargingBoList) {
            String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
            if(s != null){
                one.setStatusBit(1);
            }else{
                one.setStatusBit(0);
            }

        }
        return c3ChargingBoList;
    }

    /**
     * 查询充电桩
     * @return
     */
    public C3mCharging getByC3Mac(String c3Mac){
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
        String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
        if(s != null){
            one.setStatusBit(1);
        }else{
            one.setStatusBit(0);
        }
        return one;
    }


    /**
     * 开始充电
@@ -742,7 +777,6 @@
        }
        return getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, one.getDeviceCode()));
    }



}