From 3fb93c6ca8bd5487ac900c3434824f421e024986 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 11:57:55 +0800
Subject: [PATCH] screen-common 修复日志工具类BUG
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 bb495c8..474e18d 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
@@ -19,8 +19,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Device;
+import com.moral.api.entity.SpecialDevice;
import com.moral.api.entity.Version;
import com.moral.api.service.DeviceService;
+import com.moral.api.service.SpecialDeviceService;
import com.moral.api.service.VersionService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
@@ -39,6 +41,9 @@
@Autowired
private VersionService versionService;
+ @Autowired
+ private SpecialDeviceService specialDeviceService;
+
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -53,10 +58,14 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- //������mac���������������
+ //������mac���������������,���������������������������������������������
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", device.getMac());
- if (deviceService.count(queryWrapper) > 0) {
+ 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);
+
+ if (deviceService.getOne(queryWrapper) != null || specialDeviceService.getOne(specialDeviceQueryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
deviceService.insert(device);
@@ -88,10 +97,14 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
if (device.getMac() != null) {
- //������mac���������������
+ //������mac���������������,���������������������������������������������
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", device.getMac());
- if (deviceService.getOne(queryWrapper) != null) {
+ 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);
+
+ if (deviceService.getOne(queryWrapper) != null || specialDeviceService.getOne(specialDeviceQueryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
}
@@ -108,6 +121,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