From bd9a7f2d97af968d43ccd5516644f6933b42f5b2 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 30 Dec 2021 11:47:59 +0800
Subject: [PATCH] screen-api            增加城市优良天气对比接口

---
 screen-api/src/main/java/com/moral/api/controller/AqiController.java |   82 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/AqiController.java b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
index 428b780..b504c3b 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AqiController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -1,7 +1,12 @@
 package com.moral.api.controller;
 
-import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
-import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
+import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
+import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
+import com.moral.api.pojo.form.aqi.AreaPollutionLevelForm;
+import com.moral.api.pojo.vo.cityAQI.BarChartOfPollutionLevelVO;
+import com.moral.api.pojo.vo.cityAQI.BarChartTableOfPollutionLevelVO;
+import com.moral.api.pojo.vo.cityAQI.PieChartOfPollutionLevelVO;
+import com.moral.api.pojo.form.aqi.ChartOfPollutionLevelForm;
 import com.moral.api.service.CityAqiDailyService;
 
 import io.swagger.annotations.Api;
@@ -15,8 +20,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -97,14 +101,58 @@
      * @Date: 2021/11/11
      */
     @GetMapping("queryPieChartOfPollutionLevel")
-    public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm form) {
+    public ResultMessage queryPieChartOfPollutionLevel(ChartOfPollutionLevelForm form) {
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        PieChartOfPollutionLevelDTO dto = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
-        return ResultMessage.ok(dto);
+        PieChartOfPollutionLevelVO VO = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
+        return ResultMessage.ok(VO);
+    }
+
+    /**
+    * @Description: ������������������������������������������������
+            * @Param: [form]
+            * @return: com.moral.constant.ResultMessage
+            * @Author: ���������
+            * @Date: 2021/11/22
+            */
+    @GetMapping("queryBarChartOfPollutionLevel")
+    public ResultMessage queryBarChartOfPollutionLevel(ChartOfPollutionLevelForm form){
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        //������������
+        List<MonthlyPollutionLevel> datas = cityAqiDailyService.queryBarChartOfPollutionLevels(form);
+        //������������������
+        BarChartOfPollutionLevelVO vo = BarChartOfPollutionLevelVO.convert(datas);
+        return ResultMessage.ok(vo);
+
+    }
+
+    /**
+    * @Description: ������������������������������������������������������������
+            * @Param: [form]
+            * @return: com.moral.constant.ResultMessage
+            * @Author: ���������
+            * @Date: 2021/11/22
+            */
+    @GetMapping("queryBarChatTableOfPollutionLevel")
+    public ResultMessage queryBarChatTableOfPollutionLevel(ChartOfPollutionLevelForm form){
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        //������������
+        List<MonthlyPollutionLevel> datas = cityAqiDailyService.queryBarChartOfPollutionLevels(form);
+        List<BarChartTableOfPollutionLevelVO> vos = new ArrayList<>();
+        for (MonthlyPollutionLevel data : datas) {
+            BarChartTableOfPollutionLevelVO vo = BarChartTableOfPollutionLevelVO.convert(data);
+            vos.add(vo);
+        }
+        return ResultMessage.ok(vos);
     }
 
     @GetMapping("provincialRanking")
@@ -149,4 +197,24 @@
         List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
         return ResultMessage.ok(response);
     }
+
+    /**
+    * @Description: ������������������������������������������������
+            * @Param: [regionCode]
+            * @return: com.moral.constant.ResultMessage
+            * @Author: ���������
+            * @Date: 2021/12/30
+            */
+    @GetMapping("queryAreaPollutionLevel")
+    public ResultMessage queryAreaPollutionLevel(AreaPollutionLevelForm form){
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        //������������������
+        List<CityPollutionLevel> datas = cityAqiDailyService.queryAreaPollutionLevel(form);
+
+        return ResultMessage.ok(datas);
+    }
+
 }

--
Gitblit v1.8.0