From 5688e9adb709a253e1ce69b510457b9c88a645a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Sep 2021 16:39:18 +0800
Subject: [PATCH] screnn_api特殊设备实体类修改，走航车实时websocket,manage设备补偿
---
screen-api/src/main/java/com/moral/api/controller/DeviceController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/DeviceController.java b/screen-api/src/main/java/com/moral/api/controller/DeviceController.java
index 1c32fd9..3262a32 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DeviceController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DeviceController.java
@@ -54,8 +54,17 @@
@Autowired
private DeviceService deviceService;
+ /**
+ * @Description: ������mac������������������
+ * @Param: [mac]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/8/23
+ */
@GetMapping("queryAlarmByMac")
public ResultMessage queryAlarmByMac(String mac) {
+ if(mac==null)
+ return new ResultMessage(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg(),null);
List<Sensor> sensors = organizationUnitAlarmService.queryAlarmLevel(mac);
AlarmLevelVO vo = AlarmLevelVO.convert(sensors);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
--
Gitblit v1.8.0