Merge remote-tracking branch 'origin/master'

zss

2024-07-26 ff4d45d57c3d1a1c8d4218dd83023cb7e4c34d7e

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -150,7 +150,11 @@
        List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
                .eq(Device::getIp, ip));
        if(device.size() > 1) {
            throw new ErrorException("IP：" + ip + "配置了设备多个设备，无法进行数采！");
            String str = "";
            for (Device device1 : device) {
                str += device1.getDeviceName() + "，";
            }
            throw new ErrorException("IP：" + ip + "配置了设备多个设备：" + str + "，无法进行数采！");
        }
        if (ObjectUtils.isEmpty(device)) {
            throw new ErrorException("未给该IP：" + ip + "配置设备，无法进行数采！");