From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 02d8393..c4e303c 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
@@ -262,4 +262,12 @@
List<Map<String, Object>> professions = deviceService.selectDeviceDictData(Constants.SYSTEM_DICT_TYPE_PURCHASER);
return ResultMessage.ok(professions);
}
+
+ @RequestMapping(value = "selectMonitorPiontAndDeviceByOrgId", method = RequestMethod.GET)
+ public ResultMessage selectMonitorPiontAndDeviceByOrgId(HttpServletRequest request){
+ Map parames = WebUtils.getParametersStartingWith(request,null);
+ int id = Integer.parseInt(parames.get("organization_id").toString());
+ List<Map<String, Object>> maps = deviceService.selectMonitorPiontAndDeviceByOrgId(id);
+ return ResultMessage.ok(maps);
+ }
}
--
Gitblit v1.8.0