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 | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 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..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,7 +1,10 @@
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.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;
@@ -15,8 +18,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 +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);
+ PieChartOfPollutionLevelVO VO = cityAqiDailyService.queryPieChartOfPollutionLevels(form);
+ return ResultMessage.ok(VO);
+ }
+
+ @GetMapping("queryBarChartOfPollutionLevel")
+ 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(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")
@@ -149,4 +181,5 @@
List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
return ResultMessage.ok(response);
}
+
}
--
Gitblit v1.8.0