From 25a977a6408fe6ba20ddacf6f43bee2fe93eb17b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:41:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/controller/DeviceController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 fdfdb9d..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
@@ -103,8 +103,7 @@
queryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
QueryWrapper<SpecialDevice> specialDeviceQueryWrapper = new QueryWrapper<>();
- queryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
-
+ specialDeviceQueryWrapper.eq("mac", device.getMac()).eq("is_delete", Constants.NOT_DELETE);
if (deviceService.getOne(queryWrapper) != null || specialDeviceService.getOne(specialDeviceQueryWrapper) != null) {
return ResultMessage.fail(ResponseCodeEnum.MAC_IS_EXIST.getCode(), ResponseCodeEnum.MAC_IS_EXIST.getMsg());
}
@@ -263,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