diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java index 60afd7c..a2e36de 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java @@ -95,7 +95,7 @@ public class YDeviceService extends ServiceImpl { queryWrapper.eq("type", deviceType); } queryWrapper.eq("isDelete", 0); - if(ckId != null){ + if (ckId != null) { queryWrapper.eq("ckId", ckId); } queryWrapper.isNotNull("status"); @@ -214,7 +214,7 @@ public class YDeviceService extends ServiceImpl { ResultBean rb = ResultBean.fireSuccess(); if ("1".equals(device.getType())) { //摄像头 Device nvrDevice = this.getById(device.getNvrId()); - device.setNvrCode(nvrDevice.getVCode()); + device.setNvrCode(nvrDevice.getNvrCode()); device.setNvrSerial(nvrDevice.getSerialNumber()); device.setCkId(nvrDevice.getCkId()); }