From dfd4d6a6a8de0c13f63c06f0a3d6f39e157ecd19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 08:46:36 +0800
Subject: [PATCH] update
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 339 +++++++++++++++++++++++++-------------------------------
1 files changed, 152 insertions(+), 187 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..4adb29b 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,13 @@
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.CityPollutionLevel;
+import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
+import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
+import com.moral.api.pojo.form.aqi.*;
+import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
+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.service.CityAqiDailyService;
import io.swagger.annotations.Api;
@@ -16,10 +21,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 +102,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);
}
- @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);
- }
-
+ /**
+ * @Description: ������������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/22
+ */
@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(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);
- 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);
-
+ /**
+ * @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")
@@ -312,7 +177,7 @@
@ApiImplicitParam(name = "time", value = "������������������������day,month,year���������������", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "start", value = "������������������������������custom���������������������������������������������2021-11-02", required = true, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "end", value = "������������������������������custom���������������������������������������������2021-11-03", required = true, paramType = "query", dataType = "String"),
- @ApiImplicitParam(name = "cityType", value = "������������������������������province������������������city", required = true, paramType = "query", dataType = "String"),
+ @ApiImplicitParam(name = "cityType", value = "������������������������������province������������������city���2+28���������������28", required = true, paramType = "query", dataType = "String"),
})
public ResultMessage rankingDetails(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -333,4 +198,104 @@
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);
+ }
+
+ /**
+ * @Description: ������26+2������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/12/31
+ */
+ @GetMapping("qeury28CitiesPollutionLevel")
+ public ResultMessage query28CitiesPollutionLevel(SpecialCitiesPollutionLevelForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ List<CityPollutionLevel> datas = cityAqiDailyService.querySpecialCitiesPollutionLevel(form);
+ //������������
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ���������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/1/7
+ */
+ @GetMapping("queryProvinceCitiesPollutionLevel")
+ public ResultMessage queryProvinceCitiesPollutionLevel(ProvinceCitiesPollutionLevelForm form) {
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������������
+ List<CityPollutionLevel> datas = cityAqiDailyService.queryProvinceCitiesPollutionLevel(form);
+ //������������
+ return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ������������������������������������������
+ * @Param: [form]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/1/12
+ */
+ @GetMapping("queryAirQualityComparison")
+ public ResultMessage queryAirQualityComparison(AirQualityComparisonForm form){
+ //������������������������
+ if (!form.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ //������������
+ //������������
+ ConcentrationAndPercent c = new ConcentrationAndPercent();
+ c.setConcentration("5");
+ c.setPercent("10%");
+ List<AirQualityComparisonVO> datas = new ArrayList<>();
+ AirQualityComparisonVO vo1 = new AirQualityComparisonVO();
+ vo1.setCityName("XXX");
+ vo1.setCompositeIndex(c);
+ vo1.setPM10(c);
+ vo1.setPM25(c);
+ vo1.setSO2(c);
+ vo1.setNO2(c);
+ vo1.setCO(c);
+ vo1.setO3(c);
+ vo1.setFineDays(c);
+ vo1.setServerDays(c);
+ AirQualityComparisonVO vo2 = vo1;
+ AirQualityComparisonVO vo3 = vo1;
+ AirQualityComparisonVO vo4 = vo1;
+ AirQualityComparisonVO vo5 = vo1;
+ datas.add(vo1);
+ datas.add(vo2);
+ datas.add(vo3);
+ datas.add(vo4);
+ datas.add(vo5);
+ return ResultMessage.ok(datas);
+ }
+
}
--
Gitblit v1.8.0