From 64181b193577df8c41336d9fa3d193f484afa623 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 23 Nov 2023 15:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88nvr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervise/monitor/biz/device/YDeviceService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 109e16c..93a17eb 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 @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.monitor.api.entity.Device; import com.yxt.supervise.monitor.api.entity.WareHouse; @@ -213,10 +214,12 @@ public class YDeviceService extends ServiceImpl { public ResultBean createDevice(Device device) { ResultBean rb = ResultBean.fireSuccess(); if ("1".equals(device.getType())) { //摄像头 - Device nvrDevice = this.getById(device.getNvrId()); - device.setNvrCode(nvrDevice.getNvrCode()); - device.setNvrSerial(nvrDevice.getSerialNumber()); - device.setCkId(nvrDevice.getCkId()); + if(device.getNvrId()!=null){ + Device nvrDevice = this.getById(device.getNvrId()); + device.setNvrCode(nvrDevice.getNvrCode()); + device.setNvrSerial(nvrDevice.getSerialNumber()); + device.setCkId(nvrDevice.getCkId()); + } } if ("2".equals(device.getType())) { //电子围栏 Device nvrDevice = this.getById(device.getBjzjId());