综合监测模块字段修改

This commit is contained in:
2022-11-09 15:25:03 +08:00
parent 53b00a7d28
commit 96f4881285
8 changed files with 345 additions and 113 deletions

View File

@ -2,6 +2,8 @@ package com.ruoyi.web.controller.yada;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain_yada.entity.*;
import com.ruoyi.system.domain_yada.vo.PmKeyValueEnVo;
import com.ruoyi.system.domain_yada.vo.PmKeyValueVo;
import com.ruoyi.system.domain_yada.vo.PmYearConcentrationRatioVo;
import com.ruoyi.system.service_yada.MonitorService;
import io.swagger.annotations.Api;
@ -42,61 +44,62 @@ public class MonitorController {
@RequestMapping(value = "/eqiGrading", method = {RequestMethod.GET})
@ApiOperation(value = "亚大区域地理亚区EQI分级", httpMethod = "GET")
public AjaxResult eqiGrading(@RequestParam(value = "year") String year,
@RequestParam(value = "type") String type,
@RequestParam(value = "region") String region) {
List<MonitorEQIGradingEntity> list = monitorService.eqiGrading(year, region);
if (list.isEmpty()) {
return AjaxResult.error("未查找到信息");
}
return AjaxResult.success(list);
MonitorEQIGradingEntity monitorEQIGradingEntity = monitorService.eqiGrading(year, type, region);
return AjaxResult.success(monitorEQIGradingEntity);
}
@RequestMapping(value = "/eqiAsia", method = {RequestMethod.GET})
@ApiOperation(value = "地理亚区平均EQI分布", httpMethod = "GET")
public AjaxResult eqiAsia(@RequestParam(value = "year") String year) {
List<MonitorEQIAsiaEntity> list = monitorService.eqiAsia(year);
if (list.isEmpty()) {
return AjaxResult.error("未查找到信息");
}
return AjaxResult.success(list);
public AjaxResult eqiAsia(@RequestParam(value = "year") String year,
@RequestParam(value = "type") String type) {
PmKeyValueEnVo pmKeyValueEnVo = monitorService.eqiAsia(year, type);
return AjaxResult.success(pmKeyValueEnVo);
}
@RequestMapping(value = "/eqiCountry", method = {RequestMethod.GET})
@ApiOperation(value = "各国家平均EQI分布", httpMethod = "GET")
public AjaxResult eqiCountry(@RequestParam(value = "year") String year,
@RequestParam(value = "region") String region) {
List<MonitorEQICountryEntity> list = monitorService.eqiCountry(year, region);
if (list.isEmpty()) {
return AjaxResult.error("未查找到信息");
}
return AjaxResult.success(list);
@RequestParam(value = "region") String region,
@RequestParam(value = "type") String type) {
PmKeyValueEnVo pmKeyValueEnVo = monitorService.eqiCountry(year, region, type);
return AjaxResult.success(pmKeyValueEnVo);
}
@RequestMapping(value = "/keqi", method = {RequestMethod.GET})
@ApiOperation(value = "各地理亚区平均KEQI分布", httpMethod = "GET")
public AjaxResult keqi(@RequestParam(value = "region") String region) {
List<MonitorKEQIEntity> list = monitorService.keqi(region);
if (list.isEmpty()) {
return AjaxResult.error("未查找到信息");
}
return AjaxResult.success(list);
public AjaxResult keqi(@RequestParam(value = "region") String region,
@RequestParam(value = "type") String type) {
MonitorKEQIEntity keqi = monitorService.keqi(type, region);
return AjaxResult.success(keqi);
}
@RequestMapping(value = "/keqiAsiaRate", method = {RequestMethod.GET})
@ApiOperation(value = "各地理亚区平均KEQI变化率", httpMethod = "GET")
public AjaxResult keqiAsiaRate() {
List<MonitorKEQIAsiaRateEntity> list = monitorService.keqiAsiaRate();
if (list.isEmpty()) {
return AjaxResult.error("未查找到信息");
}
return AjaxResult.success(list);
public AjaxResult keqiAsiaRate(@RequestParam(value = "type") String type) {
PmKeyValueEnVo pmKeyValueEnVo = monitorService.keqiAsiaRate(type);
return AjaxResult.success(pmKeyValueEnVo);
}
@RequestMapping(value = "/keqiCountryRate", method = {RequestMethod.GET})
@ApiOperation(value = "各国平均KEQI变化率", httpMethod = "GET")
public AjaxResult keqiCountryRate(@RequestParam(value = "region") String region) {
List<MonitorKEQICountryRateEntity> list = monitorService.keqiCountryRate(region);
if (list.isEmpty()) {
return AjaxResult.error("未查找到信息");
}
return AjaxResult.success(list);
public AjaxResult keqiCountryRate(@RequestParam(value = "region") String region,
@RequestParam(value = "type") String type) {
PmKeyValueEnVo pmKeyValueEnVo = monitorService.keqiCountryRate(region, type);
return AjaxResult.success(pmKeyValueEnVo);
}
@RequestMapping(value = "/eqiAsiaLine", method = {RequestMethod.GET})
@ApiOperation(value = "各地理亚区平均EQI分布折线图", httpMethod = "GET")
public AjaxResult eqiAsiaLine(@RequestParam(value = "region") String region,
@RequestParam(value = "type") String type,
@RequestParam(value = "start") String start,
@RequestParam(value = "end") String end) {
PmKeyValueVo pmKeyValueVo = monitorService.eqiAsiaLine(region, type, start, end);
return AjaxResult.success(pmKeyValueVo);
}
}