From eba6f1988c6a7e37e619a27e493b17c244979070 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 30 Sep 2021 16:11:29 +0800
Subject: [PATCH] screen-aqi            完成获取监测站数据接口

---
 screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java b/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
index 74d997d..31dbeff 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
@@ -2,11 +2,13 @@
 
 import com.moral.api.pojo.dto.dataDisplay.MonitorPointDataDisplayDTO;
 import com.moral.api.pojo.form.dataDisplay.MonitorPointDataDisplayForm;
+import com.moral.api.service.DataDisplayService;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import com.moral.util.DateUtils;
 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.RequestMapping;
@@ -31,6 +33,9 @@
 @RequestMapping("/dataDisplay")
 public class DataDisplayController {
 
+    @Autowired
+    DataDisplayService dataDisplayService;
+
     @GetMapping("monitorPointDataDisplay")
     public ResultMessage monitorPointDataDisplay(MonitorPointDataDisplayForm form){
         //������������������������
@@ -38,7 +43,8 @@
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
+        List<MonitorPointDataDisplayDTO> list = dataDisplayService.getMonitorPointDisplayData(form);
+        /*MonitorPointDataDisplayDTO dto = new MonitorPointDataDisplayDTO();
         MonitorPointDataDisplayDTO dto1 = new MonitorPointDataDisplayDTO();
         MonitorPointDataDisplayDTO dto2 = new MonitorPointDataDisplayDTO();
 
@@ -89,7 +95,7 @@
         List<MonitorPointDataDisplayDTO> list = new ArrayList<>();
         list.add(dto);
         list.add(dto1);
-        list.add(dto2);
+        list.add(dto2);*/
         return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),list);
     }
 

--
Gitblit v1.8.0