diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 850c680..92ba94a 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -148,6 +148,10 @@ public class DeviceServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) public void addDevice(DeviceForm deviceForm) throws Exception { + if (deviceForm.getDeviceMac() != null && deviceForm.getBluetoothName() == null) { + throw new BadRequestException("请填写蓝牙名称!!!"); + } + Device device1 = deviceMapper.selectOne(new QueryWrapper().eq("device_mac", deviceForm.getDeviceMac())); if (device1 != null) { throw new BadRequestException("设备MAC已存在!!!"); @@ -178,6 +182,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme // 转换对象并插入数据库 Device device = new Device(); + BeanUtil.copyProperties(deviceForm, device, true); device.setDeviceNo(createDeviceNo()); LoginUser loginUser = LoginHelper.getLoginUser();