From 2613aafec8343016a565c5e3e9e6b1ad5e6c6bab Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 27 May 2021 09:09:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 78 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 23 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 780deaa..27bef1f 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
@@ -14,13 +14,18 @@
import java.util.List;
import java.util.Map;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.Device;
+import com.moral.api.entity.Version;
import com.moral.api.service.DeviceService;
+import com.moral.api.service.VersionService;
import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import com.moral.util.PageResult;
+import com.moral.util.WebUtils;
@Slf4j
@Api(tags = {"������������"})
@@ -31,12 +36,29 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private VersionService versionService;
+
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "insert", method = RequestMethod.POST)
- public ResultMessage insert(Device device) {
+ public ResultMessage insert(@RequestBody Device device) {
+ String name = device.getName();
+ String mac = device.getMac();
+ Integer monitorPointId = device.getMonitorPointId();
+ Integer versionId = device.getDeviceVersionId();
+ if (name == null || mac == null || monitorPointId == null || versionId == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ //������mac���������������
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac", device.getMac());
+ if (deviceService.getOne(queryWrapper) != null) {
+ return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
+ }
deviceService.insert(device);
return ResultMessage.ok();
}
@@ -47,6 +69,10 @@
})
@RequestMapping(value = "delete", method = RequestMethod.GET)
public ResultMessage delete(Integer deviceId) {
+ if (deviceId == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
deviceService.delete(deviceId);
return ResultMessage.ok();
}
@@ -56,37 +82,37 @@
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
})
@RequestMapping(value = "update", method = RequestMethod.POST)
- public ResultMessage update(Device device) {
+ public ResultMessage update(@RequestBody Device device) {
+ if (device.getId() == null) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ if (device.getMac() != null) {
+ //������mac���������������
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac", device.getMac());
+ if (deviceService.getOne(queryWrapper) != null) {
+ return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
+ }
+ }
deviceService.update(device);
return ResultMessage.ok();
}
@ApiOperation(value = "������������������", notes = "������������������")
@ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
- @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "orderType", value = "������������������������0������������1", required = false, paramType = "query", dataType = "String"),
@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"),
})
- @RequestMapping(value = "select", method = RequestMethod.POST)
- public ResultMessage select(@RequestBody Map<String, Object> parameters) {
- IPage<Device> page = deviceService.selectDevices(parameters);
- PageResult<Device> pageResult = new PageResult<>(
- page.getTotal(), page.getPages(), page.getRecords()
- );
- return ResultMessage.ok(pageResult);
- }
-
- @ApiOperation(value = "������������������", notes = "������������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
- })
- @RequestMapping(value = "deviceInfo", method = RequestMethod.GET)
- public ResultMessage selectDeviceInfoById(Integer deviceId) {
- Map<String, Object> result = deviceService.selectDeviceInfoById(deviceId);
+ @RequestMapping(value = "select", method = RequestMethod.GET)
+ public ResultMessage select(HttpServletRequest request) {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ Map<String, Object> result = deviceService.selectDevices(parameters);
return ResultMessage.ok(result);
}
@@ -141,9 +167,15 @@
}
@ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
+ })
@RequestMapping(value = "versions", method = RequestMethod.GET)
public ResultMessage selectVersions() {
- return null;
+ QueryWrapper<Version> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("id", "name").eq("is_delete", Constants.NOT_DELETE);
+ List<Map<String, Object>> maps = versionService.listMaps(queryWrapper);
+ return ResultMessage.ok(maps);
}
@ApiOperation(value = "���������������", notes = "���������������")
--
Gitblit v1.8.0