From 5688e9adb709a253e1ce69b510457b9c88a645a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Sep 2021 16:39:18 +0800
Subject: [PATCH] screnn_api特殊设备实体类修改，走航车实时websocket,manage设备补偿
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 474e18d..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());
}
@@ -63,7 +64,7 @@
queryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
QueryWrapper<SpecialDevice> specialDeviceQueryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
+ specialDeviceQueryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
if (deviceService.getOne(queryWrapper) != null || specialDeviceService.getOne(specialDeviceQueryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
--
Gitblit v1.8.0