changes

liuhaonan

2022-10-12 6fe040e3e2805c28442090221e9a4597381830d9

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

@@ -83,20 +83,14 @@
                "}";

        StoreOperationRecordsUtils.storeOperationData(listCode, null, "编辑一键求助子设备", content);
        boolean b = 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是否重复");
                        }
                    }
            );
        if (list.size() > 1) {
            throw new BusinessException("请检查设备mac是否重复");
        }
        boolean b = updateById(interphoneSub);
        return b;
    }

@@ -154,6 +148,13 @@
        } else {
            list = interphoneSubMapper.getInterphoneSubList(keyword, SecurityUtils.getUserId());
        }
        list.forEach(interphoneSubBo -> {
            InterphoneHostSubPole one = SpringContextHolder.getBean(InterphoneHostSubService.class).getOne(Wrappers.lambdaQuery(InterphoneHostSubPole.class)
                    .eq(InterphoneHostSubPole::getSubId, interphoneSubBo.getSubId()));
            if (one != null) {
                interphoneSubBo.setHostId(one.getHostId());
            }
        });
        return list;
    }
}