Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 2c52eaf28f9b8a666547e1307a76c3032598e57f

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

@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import lombok.AllArgsConstructor;
@@ -37,7 +40,8 @@
        List<PoleBinding> list = list(eq);
        if (list.size() != 0) {
            for (PoleBinding poleBinding : list) {
                if (poleBinding.getDeviceType().equals(deviceType)) {
                //充电桩的绑定是网络请求是带过来的灯杆信息，要允许直接修改
                if (poleBinding.getDeviceType().equals(deviceType) && deviceType != 2) {
                    throw new BusinessException("该灯杆已绑定过相同类型设备");
                }
            }
@@ -52,8 +56,21 @@
            poleBinding.setDeviceCode(param.getDeviceCode());
            return save(poleBinding);
        } else {
            //修改单灯的绑定关系的时候要额外处理的事务
            // 删除灯杆的devicescode
            if (param.getDeviceType() == 0) {
                PoleService poleService = SpringContextHolder.getBean(PoleService.class);
                Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, one.getPoleId()));
                if (pole != null) {
                    pole.setDeviceCode(null);
                    poleService.updateById(pole);
                }
            }

            one.setPoleId(poleId);
            one.setDeviceType(param.getDeviceType());
            one.setDeviceName(param.getDeviceName());
            one.setDeviceCode(param.getDeviceCode());
            return updateById(one);
        }
    }
@@ -103,4 +120,25 @@
    public PoleBinding getPoleIdByMac(String deviceCode) {
        return getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
    }


    /**
     * 判断设备归属
     *
     * @param deviceCode 设备编号
     * @param type       设备类型
     * @return 已绑定返回true，未绑定返回false
     */
    public boolean isBelong(String deviceCode, String type) {
        if (type.isEmpty() || deviceCode.isEmpty()) {
            throw new BusinessException("设备编号或类型不能为空");
        }
        Long userId = SecurityUtils.getClientId();
        Pole binding = baseMapper.getPoleByBinding(type, deviceCode, userId);
        if (binding != null) {
            return true;
        } else {
            return false;
        }
    }
}