From a8db8fd61f48e3f367cd5968c11ffa1596c52e2f Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 19 Nov 2021 08:51:23 +0800
Subject: [PATCH] screen-api 增加污染等级柱状图接口mock数据
---
screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/BarChartOfPollutionLevelDTO.java | 26 ++++++++
screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/PieChartOfPollutionLevelDTO.java | 2
screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java | 2
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 97 +++++++++++++++++++++++++++++++-
screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java | 2
5 files changed, 123 insertions(+), 6 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 8d3716f..f256e31 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,6 +1,7 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
+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.service.CityAqiDailyService;
@@ -109,8 +110,8 @@
return ResultMessage.ok(dto);
}
- @GetMapping("test")
- public ResultMessage test(){
+ @GetMapping("test1")
+ public ResultMessage test1(){
List<PieChartOfPollutionLevelDTO> dtos = new ArrayList<>();
PieChartOfPollutionLevelDTO dto = new PieChartOfPollutionLevelDTO();
dto.setTime("2021-11");
@@ -200,6 +201,96 @@
return ResultMessage.ok(dtos);
}
+ @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<>();
+
+ 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("provincialRanking")
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams(value = {
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/BarChartOfPollutionLevelDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/BarChartOfPollutionLevelDTO.java
new file mode 100644
index 0000000..83bc33c
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/BarChartOfPollutionLevelDTO.java
@@ -0,0 +1,26 @@
+package com.moral.api.pojo.dto.cityAQI;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName BarChartOfPollutionLevelDTO
+ * @Description ���������������DTO
+ * @Author ���������
+ * @Date 2021/11/19 8:31
+ * @Version TODO
+ **/
+@Data
+public class BarChartOfPollutionLevelDTO {
+ /*������������*/
+ List<String> time;
+
+ /*������������������������5���Map���������������������������������
+ * Map������������������
+ * pollution������������������
+ * days������������������
+ * proportion������������������*/
+ List<Map<String,Object>> values;
+}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/PieChartOfPollutionLevelDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/PieChartOfPollutionLevelDTO.java
similarity index 94%
rename from screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/PieChartOfPollutionLevelDTO.java
rename to screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/PieChartOfPollutionLevelDTO.java
index e09b56d..3fb7158 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/PieChartOfPollutionLevelDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/PieChartOfPollutionLevelDTO.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.dto.dataDisplay;
+package com.moral.api.pojo.dto.cityAQI;
import lombok.Data;
diff --git a/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java b/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
index 67a08d8..9a0f45f 100644
--- a/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/CityAqiDailyService.java
@@ -2,7 +2,7 @@
import com.moral.api.entity.CityAqiDaily;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
+import com.moral.api.pojo.dto.cityAQI.PieChartOfPollutionLevelDTO;
import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
/**
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
index 22a2858..5eb9d76 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/CityAqiDailyServiceImpl.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.CityAqiDaily;
import com.moral.api.mapper.CityAqiDailyMapper;
-import com.moral.api.pojo.dto.dataDisplay.PieChartOfPollutionLevelDTO;
+import com.moral.api.pojo.dto.cityAQI.PieChartOfPollutionLevelDTO;
import com.moral.api.pojo.form.aqi.QueryPieChartOfPollutionLevelForm;
import com.moral.api.service.CityAqiDailyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
--
Gitblit v1.8.0