From 1e26fc1ca98b19eaa9813a6ea03a0c65b1ccef39 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 11:58:35 +0800
Subject: [PATCH] update
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 5 ++++-
1 files changed, 4 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 8b0f88e..a373700 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
@@ -56,7 +56,7 @@
//������mac���������������
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("mac", device.getMac());
- if (deviceService.getOne(queryWrapper) != null) {
+ if (deviceService.count(queryWrapper) > 0) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
deviceService.insert(device);
@@ -108,6 +108,9 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
@ApiImplicitParam(name = "name", value = "������������������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "mac", value = "mac������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "organizationId", value = "������������������", required = false, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "monitorPointId", value = "������id", required = false, paramType = "query", dataType = "String")
+
})
@RequestMapping(value = "select", method = RequestMethod.GET)
public ResultMessage select(HttpServletRequest request) {
--
Gitblit v1.8.0