changes

liuhaonan

2022-07-07 176b4072534a7bffdd108222251d798059da5f25

changes

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

@@ -12,7 +12,6 @@
import com.sandu.ximon.dao.bo.InterphoneHostBo;
import com.sandu.ximon.dao.domain.InterphoneHost;
import com.sandu.ximon.dao.domain.InterphoneHostSubPole;
import com.sandu.ximon.dao.domain.InterphoneSub;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.InterphoneHostMapper;
import lombok.AllArgsConstructor;
@@ -37,7 +36,7 @@
     */
    public boolean addHost(InterphoneHostParam interphoneHostParam) {
        List<InterphoneHost> list = list(Wrappers.lambdaQuery(InterphoneHost.class).eq(InterphoneHost::getHostMac, interphoneHostParam.getHostMac()));
        if(list.size()>0){
        if (list.size() > 0) {
            throw new BusinessException("该设备已存在");
        }
        InterphoneHost interphoneHost = new InterphoneHost();
@@ -69,12 +68,12 @@
            return false;
        }

       if(SecurityUtils.getClientId()!=null){
           boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getHostMac(), PoleBindingEnums.FOR_HELP);
           if (!belong) {
               throw new BusinessException("该设备不属于您,不能修改设备信息");
           }
       }
        if (SecurityUtils.getClientId() != null) {
            boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getHostMac(), PoleBindingEnums.FOR_HELP);
            if (!belong) {
                throw new BusinessException("该设备不属于您,不能修改设备信息");
            }
        }
        InterphoneHost interphoneHost = new InterphoneHost();
        interphoneHost.setHostId(id);
        BeanUtils.copyProperties(interphoneHostParam, interphoneHost);
@@ -91,11 +90,17 @@
        /**
         * 编辑一键求助主机 日志记录结束
         */
        boolean b = updateById(interphoneHost);
        List<InterphoneHost> list = list(Wrappers.lambdaQuery(InterphoneHost.class).eq(InterphoneHost::getHostMac, interphoneHostParam.getHostMac()));
        if(list.size()>1){
            throw new BusinessException("请检查设备mac是否重复");
        if (list.size() > 0) {
            list.forEach(
                    host -> {
                        if (!host.getHostId().equals(id)) {
                            throw new BusinessException("请检查设备mac是否重复");
                        }
                    }
            );
        }
        boolean b = updateById(interphoneHost);
        return b;
    }


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

@@ -17,6 +17,7 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
@@ -57,6 +58,7 @@
    /**
     * 修改子设备
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean updateSub(Integer id, InterphoneSubParam interphoneSubParam) {
        InterphoneSub byId = getById(id);
        if (byId == null) {
@@ -84,11 +86,17 @@
        /**
         * 编辑一键求助子设备 日志记录结束
         */
        boolean b = updateById(interphoneSub);
        List<InterphoneSub> list = list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, interphoneSubParam.getSubMac()));
        if (list.size() > 1) {
            throw new BusinessException("请检查设备mac是否重复");
        if (list.size() > 0) {
            list.forEach(
                    sub->{
                        if(!sub.getSubId().equals(id)){
                            throw new BusinessException("请检查设备mac是否重复");
                        }
                    }
            );
        }
        boolean b = updateById(interphoneSub);
        return b;
    }