From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationLayoutController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationLayoutController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
index d0f8d23..91ff1ab 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationLayoutController.java
@@ -56,4 +56,18 @@
organizationLayoutService.setUp(map,organizationLayouts);
return ResultMessage.ok();
}
+
+ @RequestMapping(value = "getLayoutByMac", method = RequestMethod.GET)
+ @ResponseBody
+ public ResultMessage getLayoutByMac(HttpServletRequest request){
+ Map<String,Object> parameters = WebUtils.getParametersStartingWith(request,null);
+ if (ObjectUtils.isEmpty(parameters.get("mac"))){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String,Object> resultMap = organizationLayoutService.getLayoutByMac(parameters.get("mac").toString());
+ if (ObjectUtils.isEmpty(resultMap)){
+ return null;
+ }
+ return ResultMessage.ok(resultMap);
+ }
}
--
Gitblit v1.8.0