From 5158c660013d52524559d4435f27b5e63d3221b7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 17 Nov 2021 13:54:25 +0800
Subject: [PATCH] screen-api 更改饼状图接口
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 197 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 172 insertions(+), 25 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 640f34f..8d3716f 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,5 +1,9 @@
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.service.CityAqiDailyService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -11,6 +15,8 @@
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;
@@ -29,6 +35,8 @@
@Autowired
private CityAqiService cityAqiService;
+ @Autowired
+ private CityAqiDailyService cityAqiDailyService;
@GetMapping("compareO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@@ -45,54 +53,193 @@
}
/**
- * @Description: ���������������6������aqi������
- * @Param: [regionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/1
- */
+ * @Description: ���������������6������aqi������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/1
+ */
@GetMapping("queryByRegionCode")
- public ResultMessage queryByRegionCode(Integer regionCode){
+ public ResultMessage queryByRegionCode(Integer regionCode) {
Map<String, Object> value = cityAqiService.queryCityAqiByRegionCode(regionCode);
return ResultMessage.ok(value);
}
/**
- * @Description: ������������24���������aqi������
- * @Param: [regionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/1
- */
+ * @Description: ������������24���������aqi������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/1
+ */
@GetMapping("query24HoursAQI")
- public ResultMessage query24HoursAQIByRegionCode(Integer regionCode){
+ public ResultMessage query24HoursAQIByRegionCode(Integer regionCode) {
Map<String, Object> datas = cityAqiService.query24HoursAqiByRegionCode(regionCode);
return ResultMessage.ok(datas);
}
/**
- * @Description: ���������������������aqi���������������������
- * @Param: [RegionCode]
- * @return: com.moral.constant.ResultMessage
- * @Author: ���������
- * @Date: 2021/11/2
- */
+ * @Description: ���������������������aqi���������������������
+ * @Param: [RegionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/2
+ */
@GetMapping("queryTodayAqiAndPollutant")
- public ResultMessage queryTodayAqiAndPollutant(Integer regionCode){
+ public ResultMessage queryTodayAqiAndPollutant(Integer regionCode) {
Map<String, Object> datas = cityAqiService.queryTodayAqiAndPollutant(regionCode);
return ResultMessage.ok(datas);
+ }
+
+ /**
+ * @Description: ������������������������������������������������
+ * @Param: [regionCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2021/11/11
+ */
+ @GetMapping("queryPieChartOfPollutionLevel")
+ public ResultMessage queryPieChartOfPollutionLevel(QueryPieChartOfPollutionLevelForm 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("test")
+ public ResultMessage test(){
+ 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);
}
@GetMapping("provincialRanking")
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "organizationId", value = "������id", required = true, paramType = "query", dataType = "Integer")
+ @ApiImplicitParam(name = "regionCode", value = "������", required = true, paramType = "query", dataType = "Integer")
})
- public ResultMessage provincialRanking(Integer organizationId) {
- if (ObjectUtils.isEmpty(organizationId)) {
+ public ResultMessage provincialRanking(Integer regionCode) {
+ if (ObjectUtils.isEmpty(regionCode)) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- Map<String, Object> response = cityAqiService.provincialRanking(organizationId);
+ Map<String, Object> response = cityAqiService.provincialRanking(regionCode);
+ return ResultMessage.ok(response);
+ }
+
+ @GetMapping("rankingDetails")
+ @ApiOperation(value = "������������", notes = "������������")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "regionCode", value = "������", required = true, paramType = "query", dataType = "Integer"),
+ @ApiImplicitParam(name = "type", value = "������������������������������today������������hour���������day���������month���������year���������������custom", required = true, paramType = "query", dataType = "String"),
+ @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"),
+ })
+ public ResultMessage rankingDetails(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ if (!params.containsKey("type") || !params.containsKey("cityType") || !params.containsKey("regionCode")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Object type = params.get("type");
+ if ("hour".equals(type) || "day".equals(type) || "month".equals(type) || "year".equals(type)) {
+ if (!params.containsKey("time")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ }
+ if ("custom".equals(type)) {
+ if (!params.containsKey("start") || !params.containsKey("end")) {
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ }
+ List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
return ResultMessage.ok(response);
}
}
--
Gitblit v1.8.0