From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 25 Aug 2023 14:12:48 +0800
Subject: [PATCH] chore:过滤海城小时数据
---
screen-manage/src/main/java/com/moral/api/controller/OrganizationLayoutController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 f07f027..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
@@ -52,9 +52,22 @@
Map<String, Integer> map = new HashMap<>();
map.put("organization_id",organization_id);
map.put("version_id",version_id);
- organizationLayoutService.delete(map);
List<OrganizationLayout> organizationLayouts = organizationLayoutSetUp.getOrganizationLayouts();
- organizationLayoutService.insertList(organizationLayouts);
+ 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