From 03791ab057f15d102bc20b83c687f8a8028a4b8f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 28 Dec 2021 13:47:38 +0800
Subject: [PATCH] 行业贡献率update

---
 screen-api/src/main/java/com/moral/api/controller/AqiController.java |  221 ++++++++----------------------------------------------
 1 files changed, 35 insertions(+), 186 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 f256e31..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,8 +1,10 @@
 package com.moral.api.controller;
 
-import com.moral.api.pojo.dto.cityAQI.BarChartOfPollutionLevelDTO;
-import com.moral.api.pojo.dto.cityAQI.PieChartOfPollutionLevelDTO;
-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;
@@ -16,10 +18,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -100,195 +99,44 @@
      * @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(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        PieChartOfPollutionLevelDTO dto = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
-        return ResultMessage.ok(dto);
-    }
-
-    @GetMapping("test1")
-    public ResultMessage test1(){
-        List<PieChartOfPollutionLevelDTO> dtos = new ArrayList<>();
-        PieChartOfPollutionLevelDTO dto = new PieChartOfPollutionLevelDTO();
-        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);
-
-        PieChartOfPollutionLevelDTO dto1 = new PieChartOfPollutionLevelDTO();
-        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);
+        PieChartOfPollutionLevelVO VO = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
+        return ResultMessage.ok(VO);
     }
 
     @GetMapping("queryBarChartOfPollutionLevel")
-    public ResultMessage queryBarChartOfPollutionLevel(){
-        BarChartOfPollutionLevelDTO dto = new BarChartOfPollutionLevelDTO();
-        List<String> time = new ArrayList<>();
-        time.add("2021-10");
-        time.add("2021-11");
-        List<Map<String,Object>> values = new ArrayList<>();
+    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);
 
-        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("20%");
-        proportion6.add("20%");
-        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);
-
+    @GetMapping("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<>();
+        for (MonthlyPollutionLevel data : datas) {
+            BarChartTableOfPollutionLevelVO vo = BarChartTableOfPollutionLevelVO.convert(data);
+            vos.add(vo);
+        }
+        return ResultMessage.ok(vos);
     }
 
     @GetMapping("provincialRanking")
@@ -333,4 +181,5 @@
         List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
         return ResultMessage.ok(response);
     }
+
 }

--
Gitblit v1.8.0