From 86c06b0f6f30099b436814ab223121aa8239081a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index ee0ddcd..39012ba 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -43,6 +43,24 @@
}
/**
+ * @param mac ������mac
+ * @return ������������������������������������
+ */
+ @GetMapping("getDates")
+ @ApiOperation(value = "������������������������������", notes = "������������������������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
+ @ApiImplicitParam(name = "mac", value = "������mac", required = true, paramType = "query", dataType = "String")
+ })
+ public ResultMessage getDates(String mac) {
+ if (ObjectUtils.isEmpty(mac)) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<String> response = specialDeviceService.getDatesByMac(mac);
+ return ResultMessage.ok(response);
+ }
+
+ /**
* @param request ������������
* @return ������������������������������������
*/
--
Gitblit v1.8.0