From 2c2ba786f0edf8c14549c9a2e69ec738a4771233 Mon Sep 17 00:00:00 2001 From: yangzongjia Date: Wed, 23 Aug 2023 09:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=97=B6?= =?UTF-8?q?=E5=80=99=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/supervise/monitor/biz/device/YDeviceService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()); }