From 2f701e2189b7cf22b3dd720b02952650ebed1919 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 02 Sep 2021 10:24:01 +0800
Subject: [PATCH] screen-api 修改logback
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 25 +++++++++++++++++++------
1 files changed, 19 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 a373700..e86a967 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<>();
+ 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());
}
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());
}
}
--
Gitblit v1.8.0