From db2b30bbe239427a89521cd858b2b191d56086ef Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Sep 2021 09:41:06 +0800
Subject: [PATCH] 获取有走航车数据日期,device修改,绑定国控站

---
 screen-manage/src/main/java/com/moral/api/controller/DeviceController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
index e86a967..fdfdb9d 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/DeviceController.java
@@ -6,6 +6,7 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -54,7 +55,7 @@
         String mac = device.getMac();
         Integer monitorPointId = device.getMonitorPointId();
         Integer versionId = device.getDeviceVersionId();
-        if (name == null || mac == null || monitorPointId == null || versionId == null) {
+        if (ObjectUtils.isEmpty(name) || ObjectUtils.isEmpty(mac) || ObjectUtils.isEmpty(monitorPointId) || ObjectUtils.isEmpty(versionId)) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }

--
Gitblit v1.8.0