From fc8fe626f222e024c1c4b45759ef0102174e5b9c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 12 Apr 2023 09:11:58 +0800
Subject: [PATCH] 添加风场历史小时数据显示
---
screen-api/src/main/java/com/moral/api/controller/HistoryFiveMinutelyController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 169fcca..38a1a71 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,21 @@
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.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @ClassName HistoryFiveMinutely
@@ -65,8 +71,13 @@
* @Date: 2022/3/10
*/
@GetMapping("queryPopDataByMac")
- public ResultMessage queryPopDataByMac(String mac){
- return ResultMessage.ok(historyFiveMinutelyService.getPopDataByMac(mac));
+ 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