From 60477d72e953fc73744943db3c63f26d8eb94a19 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 22 Nov 2021 09:19:43 +0800
Subject: [PATCH] screen-api 增加获取柱状图表格数据的mock接口
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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..c3210a4 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,8 @@
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.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.service.CityAqiDailyService;
@@ -16,10 +17,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;
@@ -106,14 +104,14 @@
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();
+ List<PieChartOfPollutionLevelVO> dtos = new ArrayList<>();
+ PieChartOfPollutionLevelVO dto = new PieChartOfPollutionLevelVO();
dto.setTime("2021-11");
dto.setTotalDays(10);
List<Map<String,Object>> list = new ArrayList<>();
@@ -154,7 +152,7 @@
list.add(map5);
dto.setValues(list);
- PieChartOfPollutionLevelDTO dto1 = new PieChartOfPollutionLevelDTO();
+ PieChartOfPollutionLevelVO dto1 = new PieChartOfPollutionLevelVO();
dto1.setTime("2021-11");
List<Map<String,Object>> list1 = new ArrayList<>();
@@ -203,7 +201,7 @@
@GetMapping("queryBarChartOfPollutionLevel")
public ResultMessage queryBarChartOfPollutionLevel(){
- BarChartOfPollutionLevelDTO dto = new BarChartOfPollutionLevelDTO();
+ BarChartOfPollutionLevelVO dto = new BarChartOfPollutionLevelVO();
List<String> time = new ArrayList<>();
time.add("2021-10");
time.add("2021-11");
@@ -273,8 +271,8 @@
days6.add(0);
days6.add(0);
List<String> proportion6 = new ArrayList<>();
- proportion6.add("20%");
- proportion6.add("20%");
+ proportion6.add("0%");
+ proportion6.add("0%");
map6.put("days",days6);
map6.put("proportion",proportion6);
@@ -289,6 +287,35 @@
dto.setValues(values);
return ResultMessage.ok(dto);
+ }
+
+ @GetMapping("queryBarChatTableOfPollutionLevel")
+ public ResultMessage queryBarChatTableOfPollutionLevel(){
+ 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);
+ return ResultMessage.ok(vos);
}
@GetMapping("provincialRanking")
@@ -333,4 +360,5 @@
List<Map<String, Object>> response = cityAqiService.rankingDetails(params);
return ResultMessage.ok(response);
}
+
}
--
Gitblit v1.8.0