changes

liuhaonan

2022-07-07 176b4072534a7bffdd108222251d798059da5f25

 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;
@@ -32,6 +33,10 @@
     * 新增子设备
     */
    public boolean addSub(InterphoneSubParam interphoneSubParam) {
        List<InterphoneSub> list = list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, interphoneSubParam.getSubMac()));
        if (list.size() > 0) {
            throw new BusinessException("该设备已存在");
        }
        InterphoneSub interphoneSub = new InterphoneSub();
        BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
        boolean save = save(interphoneSub);
@@ -53,14 +58,17 @@
    /**
     * 修改子设备
     */
    @Transactional(rollbackFor = Exception.class)
    public boolean updateSub(Integer id, InterphoneSubParam interphoneSubParam) {
        InterphoneSub byId = getById(id);
        if (byId == null) {
            return false;
        }
        boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSubMac(), PoleBindingEnums.FOR_HELP);
        if (!belong) {
            throw new BusinessException("该设备不属于您,不能修改设备信息");
        if (SecurityUtils.getClientId() != null) {
            boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(byId.getSubMac(), PoleBindingEnums.FOR_HELP);
            if (!belong) {
                throw new BusinessException("该设备不属于您,不能修改设备信息");
            }
        }
        InterphoneSub interphoneSub = new InterphoneSub();
        BeanUtils.copyProperties(interphoneSubParam, interphoneSub);
@@ -78,8 +86,18 @@
        /**
         * 编辑一键求助子设备 日志记录结束
         */

        return updateById(interphoneSub);
        List<InterphoneSub> list = list(Wrappers.lambdaQuery(InterphoneSub.class).eq(InterphoneSub::getSubMac, interphoneSubParam.getSubMac()));
        if (list.size() > 0) {
            list.forEach(
                    sub->{
                        if(!sub.getSubId().equals(id)){
                            throw new BusinessException("请检查设备mac是否重复");
                        }
                    }
            );
        }
        boolean b = updateById(interphoneSub);
        return b;
    }

    /**