From 7e2f3abca2f5bb83459f809b8e7195b361e0a372 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 12:00:30 +0800
Subject: [PATCH] ci:补充提交
---
screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 3ef66f3..c1a60d8 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
@@ -6,15 +6,22 @@
import com.moral.api.service.HistoryFiveMinutelyService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
+import com.moral.util.WebUtils;
+
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @ClassName HistoryFiveMinutely
@@ -34,6 +41,13 @@
@Autowired
HistoryFiveMinutelyService historyFiveMinutelyService;
+ /**
+ * @Description: ���������������������������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/3/10
+ */
@GetMapping("queryDeviceAndData")
public ResultMessage queryDeviceAndData(QueryDeviceAndFiveMinuteDataForm form){
//������������������������
@@ -42,12 +56,30 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������
- List<DeviceAndFiveMinuteDataDTO> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);
-
+ List<Map<String, Object>> dto = historyFiveMinutelyService.queryDeviceAndFiveMinuteData(form);
+ Map<String,List<Map<String, Object>>> dtoResult = new HashMap<>();
+ dtoResult.put("devices",dto);
//������������������
- DeviceAndFiveMinuteDataVO vo = DeviceAndFiveMinuteDataVO.convert(dto);
+ //DeviceAndFiveMinuteDataVO vo = DeviceAndFiveMinuteDataVO.convert(dto);
- return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), vo);
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), dtoResult);
+ }
+
+ /**
+ * @Description: ���������������������������������
+ * @Param: [mac]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/3/10
+ */
+ @GetMapping("queryPopDataByMac")
+ public ResultMessage queryPopDataByMac(HttpServletRequest request){
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ Map<String, Object> popDataByMac = historyFiveMinutelyService.getPopDataByMac(params);
+ if (popDataByMac==null){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return ResultMessage.ok(popDataByMac);
}
}
--
Gitblit v1.8.0