From ddc89794e706cd35e2f43543a345148e30a0a91f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 03 Jan 2023 16:42:21 +0800
Subject: [PATCH] 修改浑南模板格式问题
---
screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java b/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
index c11637f..169fcca 100644
--- a/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java
@@ -34,13 +34,20 @@
@Autowired
HistoryFiveMinutelyService historyFiveMinutelyService;
+ /**
+ * @Description: ���������������������������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/3/10
+ */
@GetMapping("queryDeviceAndData")
public ResultMessage queryDeviceAndData(QueryDeviceAndFiveMinuteDataForm form){
- //18 110100
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
//������������������
List<DeviceAndFiveMinuteDataDTO> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);
@@ -49,6 +56,18 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
}
+
+ /**
+ * @Description: ���������������������������������
+ * @Param: [mac]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/3/10
+ */
+ @GetMapping("queryPopDataByMac")
+ public ResultMessage queryPopDataByMac(String mac){
+ return ResultMessage.ok(historyFiveMinutelyService.getPopDataByMac(mac));
+ }
}
--
Gitblit v1.8.0