From 62e7442abe2ad4b296d0211e6f0cd327865fe24f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 22 Nov 2021 17:13:44 +0800
Subject: [PATCH] screen-api            完成柱状图数据和表格的逻辑代码

---
 screen-api/src/main/java/com/moral/api/controller/AqiController.java |  233 ++++++---------------------------------------------------
 1 files changed, 27 insertions(+), 206 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 c3210a4..c248635 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,9 +1,10 @@
 package com.moral.api.controller;
 
-import com.moral.api.pojo.dto.cityAQI.BarChartOfPollutionLevelVO;
-import com.moral.api.pojo.dto.cityAQI.BarChartTableOfPollutionLevelVO;
-import com.moral.api.pojo.dto.cityAQI.PieChartOfPollutionLevelVO;
-import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
+import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
+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.QueryChartOfPollutionLevelForm;
 import com.moral.api.service.CityAqiDailyService;
 
 import io.swagger.annotations.Api;
@@ -98,7 +99,7 @@
      * @Date: 2021/11/11
      */
     @GetMapping("queryPieChartOfPollutionLevel")
-    public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm form) {
+    public ResultMessage queryPieChartOfPollutionLevel(QueryChartOfPollutionLevelForm form) {
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -108,213 +109,33 @@
         return ResultMessage.ok(VO);
     }
 
-    @GetMapping("test1")
-    public ResultMessage test1(){
-        List<PieChartOfPollutionLevelVO> dtos = new ArrayList<>();
-        PieChartOfPollutionLevelVO dto = new PieChartOfPollutionLevelVO();
-        dto.setTime("2021-11");
-        dto.setTotalDays(10);
-        List<Map<String,Object>> list = new ArrayList<>();
-        Map<String,Object> map = new HashMap<>();
-        map.put("proportion","40%");
-        map.put("days",4);
-        map.put("pollution",0);
-        list.add(map);
-
-        Map<String,Object> map1 = new HashMap<>();
-        map1.put("proportion","30%");
-        map1.put("days",3);
-        map1.put("pollution",1);
-        list.add(map1);
-
-        Map<String,Object> map2 = new HashMap<>();
-        map2.put("proportion","30%");
-        map2.put("days",3);
-        map2.put("pollution",2);
-        list.add(map2);
-
-        Map<String,Object> map3 = new HashMap<>();
-        map3.put("proportion","0%");
-        map3.put("days",0);
-        map3.put("pollution",3);
-        list.add(map3);
-
-        Map<String,Object> map4 = new HashMap<>();
-        map4.put("proportion","0%");
-        map4.put("days",0);
-        map4.put("pollution",4);
-        list.add(map4);
-
-        Map<String,Object> map5 = new HashMap<>();
-        map5.put("proportion","0%");
-        map5.put("days",0);
-        map5.put("pollution",5);
-        list.add(map5);
-        dto.setValues(list);
-
-        PieChartOfPollutionLevelVO dto1 = new PieChartOfPollutionLevelVO();
-        dto1.setTime("2021-11");
-        List<Map<String,Object>> list1 = new ArrayList<>();
-
-        Map<String,Object> map11 = new HashMap<>();
-        map11.put("proportion","40%");
-        map11.put("days",4);
-        map11.put("pollution",0);
-        list1.add(map11);
-
-        Map<String,Object> map12 = new HashMap<>();
-        map12.put("proportion","30%");
-        map12.put("days",3);
-        map12.put("pollution",1);
-        list1.add(map12);
-
-        Map<String,Object> map13 = new HashMap<>();
-        map13.put("proportion","30%");
-        map13.put("days",3);
-        map13.put("pollution",2);
-        list1.add(map13);
-
-        Map<String,Object> map14 = new HashMap<>();
-        map14.put("proportion","0%");
-        map14.put("days",0);
-        map14.put("pollution",3);
-        list1.add(map14);
-
-        Map<String,Object> map15 = new HashMap<>();
-        map15.put("proportion","0%");
-        map15.put("days",0);
-        map15.put("pollution",4);
-        list1.add(map15);
-
-        Map<String,Object> map16 = new HashMap<>();
-        map16.put("proportion","0%");
-        map16.put("days",0);
-        map16.put("pollution",5);
-        list1.add(map16);
-        dto1.setValues(list1);
-        dto1.setTotalDays(10);
-
-        dtos.add(dto);
-        dtos.add(dto1);
-        return ResultMessage.ok(dtos);
-    }
-
     @GetMapping("queryBarChartOfPollutionLevel")
-    public ResultMessage queryBarChartOfPollutionLevel(){
-        BarChartOfPollutionLevelVO dto = new BarChartOfPollutionLevelVO();
-        List<String> time = new ArrayList<>();
-        time.add("2021-10");
-        time.add("2021-11");
-        List<Map<String,Object>> values = new ArrayList<>();
-
-        Map<String,Object> map1 = new HashMap<>();
-        map1.put("pollution",0);
-        List<Integer> days1 = new ArrayList<>();
-        days1.add(4);
-        days1.add(6);
-        List<String> proportion1 = new ArrayList<>();
-        proportion1.add("40%");
-        proportion1.add("60%");
-        map1.put("days",days1);
-        map1.put("proportion",proportion1);
-
-        Map<String,Object> map2 = new HashMap<>();
-        map2.put("pollution",1);
-        List<Integer> days2 = new ArrayList<>();
-        days2.add(1);
-        days2.add(0);
-        List<String> proportion2 = new ArrayList<>();
-        proportion2.add("10%");
-        proportion2.add("0%");
-        map2.put("days",days2);
-        map2.put("proportion",proportion2);
-
-        Map<String,Object> map3 = new HashMap<>();
-        map3.put("pollution",2);
-        List<Integer> days3 = new ArrayList<>();
-        days3.add(1);
-        days3.add(0);
-        List<String> proportion3 = new ArrayList<>();
-        proportion3.add("10%");
-        proportion3.add("0%");
-        map3.put("days",days3);
-        map3.put("proportion",proportion3);
-
-
-        Map<String,Object> map4 = new HashMap<>();
-        map4.put("pollution",3);
-        List<Integer> days4 = new ArrayList<>();
-        days4.add(2);
-        days4.add(2);
-        List<String> proportion4 = new ArrayList<>();
-        proportion4.add("20%");
-        proportion4.add("20%");
-        map4.put("days",days4);
-        map4.put("proportion",proportion4);
-
-
-        Map<String,Object> map5 = new HashMap<>();
-        map5.put("pollution",4);
-        List<Integer> days5 = new ArrayList<>();
-        days5.add(2);
-        days5.add(2);
-        List<String> proportion5 = new ArrayList<>();
-        proportion5.add("20%");
-        proportion5.add("20%");
-        map5.put("days",days5);
-        map5.put("proportion",proportion5);
-
-
-        Map<String,Object> map6 = new HashMap<>();
-        map6.put("pollution",5);
-        List<Integer> days6 = new ArrayList<>();
-        days6.add(0);
-        days6.add(0);
-        List<String> proportion6 = new ArrayList<>();
-        proportion6.add("0%");
-        proportion6.add("0%");
-        map6.put("days",days6);
-        map6.put("proportion",proportion6);
-
-        values.add(map1);
-        values.add(map2);
-        values.add(map3);
-        values.add(map4);
-        values.add(map5);
-        values.add(map6);
-
-        dto.setTime(time);
-        dto.setValues(values);
-        return ResultMessage.ok(dto);
+    public ResultMessage queryBarChartOfPollutionLevel(QueryChartOfPollutionLevelForm 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);
 
     }
 
     @GetMapping("queryBarChatTableOfPollutionLevel")
-    public ResultMessage queryBarChatTableOfPollutionLevel(){
+    public ResultMessage queryBarChatTableOfPollutionLevel(QueryChartOfPollutionLevelForm 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<>();
-
-        BarChartTableOfPollutionLevelVO vo1 = new BarChartTableOfPollutionLevelVO();
-        BarChartTableOfPollutionLevelVO vo2 = new BarChartTableOfPollutionLevelVO();
-        vo1.setExcellent("4(40%)");
-        vo1.setGood("1(10%)");
-        vo1.setMild("1(10%)");
-        vo1.setMiddle("2(20%)");
-        vo1.setSerious("2(20%)");
-        vo1.setServer("0(0%)");
-        vo1.setTotal("10(100%)");
-        vo1.setTime("2021���10���");
-
-        vo2.setExcellent("6(60%)");
-        vo2.setGood("0(0%)");
-        vo2.setMild("0(0%)");
-        vo2.setMiddle("2(20%)");
-        vo2.setSerious("2(20%)");
-        vo2.setServer("0(0%)");
-        vo2.setTotal("10(100%)");
-        vo2.setTime("2021���11���");
-
-        vos.add(vo1);
-        vos.add(vo2);
+        for (MonthlyPollutionLevel data : datas) {
+            BarChartTableOfPollutionLevelVO vo = BarChartTableOfPollutionLevelVO.convert(data);
+            vos.add(vo);
+        }
         return ResultMessage.ok(vos);
     }
 

--
Gitblit v1.8.0