fix

zhanzhiqin

2022-04-14 8fa5a6dd8045fb298e391498e2ef2cd904dade45

fix

 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;
@@ -93,6 +95,15 @@
                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 {
            //将设备信息添加到充电桩设备表
            one.setPoleDevicesCode(deviceName);

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

@@ -35,7 +35,7 @@
//        }
        LambdaQueryWrapper<PoleBinding> eq = Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId);
        List<PoleBinding> list = list(eq);
        if (list.size() != 0){
        if (list.size() != 0) {
            for (PoleBinding poleBinding : list) {
                if (poleBinding.getDeviceType().equals(deviceType)) {
                    throw new BusinessException("该灯杆已绑定过相同类型设备");
@@ -52,7 +52,9 @@
            poleBinding.setDeviceCode(param.getDeviceCode());
            return save(poleBinding);
        } else {
            throw new BusinessException("该设备已绑定过");
            one.setPoleId(poleId);
            one.setDeviceType(param.getDeviceType());
            return updateById(one);
        }
    }