From 70f550bb3414caef9a02f34a053ad9a69d9c663d Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Tue, 08 Mar 2022 13:27:04 +0800 Subject: [PATCH] 修改Organization_Layout查询接口返回数据 --- screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 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..ac6fdb9 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 @@ -38,7 +38,25 @@ @GetMapping("selectCruisers") @ApiOperation(value = "������������������������������������������", notes = "���������������") public ResultMessage getCarsInfo() { - List<Map<String, Object>> response = specialDeviceService.getCarsInfo(); + List<Map<String, Object>> response = specialDeviceService.selectCruisers(); + return ResultMessage.ok(response); + } + + /** + * @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); } -- Gitblit v1.8.0