From 7a1c0a8f26b54db6fdf0dcb9a2568aa9811f8f4c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 18 Jun 2024 15:20:10 +0800
Subject: [PATCH] fix:测试提交
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 123 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 15 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 428474f..af4eab5 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,29 +1,25 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.cityAQI.CityPollutionLevel;
-import com.moral.api.pojo.dto.cityAQI.ConcentrationAndPercent;
-import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel;
+import com.moral.api.config.properties.SpecialCitiesProperties;
+import com.moral.api.entity.SysArea;
+import com.moral.api.pojo.dto.cityAQI.*;
import com.moral.api.pojo.form.aqi.*;
-import com.moral.api.pojo.vo.cityAQI.AirQualityComparisonVO;
-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.vo.cityAQI.*;
import com.moral.api.service.CityAqiDailyService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.moral.api.service.CityAqiYearlyService;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
import com.moral.api.service.CityAqiService;
import com.moral.constant.ResponseCodeEnum;
@@ -40,6 +36,10 @@
private CityAqiService cityAqiService;
@Autowired
private CityAqiDailyService cityAqiDailyService;
+ @Autowired
+ SpecialCitiesProperties specialCitiesProperties;
+ @Autowired
+ CityAqiYearlyService cityAqiYearlyService;
@GetMapping("compareO3")
@ApiOperation(value = "���������������������������", notes = "���������������������������")
@@ -53,6 +53,30 @@
}
List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params);
return ResultMessage.ok(response);
+ }
+
+ @GetMapping("compareO3New")
+ @ApiOperation(value = "���������������������������New", notes = "���������������������������New")
+ public ResultMessage compareO3New(@RequestParam @ApiParam(value = "������code",name = "regionCode") String regionCode,
+ @RequestParam @ApiParam(value = "������",name = "time") String time) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("regionCode",regionCode);
+ params.put("time",time);
+ List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params);
+ Map<Integer, List<Map<String, Object>>> groupMap = response.stream().collect(Collectors.groupingBy(it->it.get("type").toString().equals("������")?0:1));
+ return ResultMessage.ok(groupMap);
+ }
+
+ @GetMapping("getO38H")
+ @ApiOperation(value = "���������������������8������������New", notes = "���������������������8������������New")
+ public ResultMessage getO38H(@RequestParam @ApiParam(value = "������code",name = "regionCode") String regionCode,
+ @RequestParam @ApiParam(value = "������",name = "time") String time) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("regionCode",regionCode);
+ params.put("time",time);
+ List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3_8H(params);
+ Map<Integer, List<Map<String, Object>>> groupMap = response.stream().collect(Collectors.groupingBy(it->it.get("type").toString().equals("������")?0:1));
+ return ResultMessage.ok(groupMap);
}
/**
@@ -275,4 +299,73 @@
return ResultMessage.ok(datas);
}
+ /**
+ * @Description: ������������������������
+ * @Param: [year, cityCode]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/2/10
+ */
+ @GetMapping("queryPollutionLevelAnalysis")
+ public ResultMessage queryPollutionLevelAnalysis( String year, Integer cityCode){
+ if(year==null||cityCode==null)
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ Map<String, DataPercentRange> result = cityAqiYearlyService.analysisPollutionLevel(year, cityCode);
+ return ResultMessage.ok(result);
+ }
+
+ @GetMapping("queryComplianceDaysAnalysis")
+ public ResultMessage queryComplianceDaysAnalysis( String year, Integer cityCode){
+ if(year==null||cityCode==null)
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ List<ComplianceDaysDTO> dtos = cityAqiYearlyService.analysisComplianceDays(year, cityCode);
+ return ResultMessage.ok(ComplianceDaysVO.convert(dtos));
+ }
+
+ @GetMapping("momDate")
+ public ResultMessage momDate(Integer regionCode, Integer size, Integer current, Integer orgId){
+ if(regionCode==null || size==null || current==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> result = cityAqiService.momData(regionCode, size, current, orgId);
+ return ResultMessage.ok(result);
+ }
+
+ /**
+ * @Description: ������������������������������ ������7
+ * @Param: [regionCode, time]
+ * @return: com.moral.constant.ResultMessage
+ * @Author: ���������
+ * @Date: 2022/3/16
+ */
+ @GetMapping("cityAreaRange")
+ public ResultMessage cityAreaRange(Integer regionCode,@DateTimeFormat(pattern = "yyyy-MM-dd") Date time){
+ if(regionCode==null || time==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ List<CityAreaRangeVO> vos = cityAqiDailyService.cityAreaRange(regionCode,time);
+ return ResultMessage.ok(vos);
+ }
+
+ /**
+ *@Description: ���������������
+ *@Param: [regionCode]
+ *@return: com.moral.constant.ResultMessage
+ *@Author: lizijie
+ *@Date: 2022/3/16 16:54
+ **/
+ @GetMapping("countyData")
+ public ResultMessage countyData(Integer regionCode){
+ if(regionCode==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ Map<String, Object> resultMap = cityAqiService.countyData(regionCode);
+ return ResultMessage.ok(resultMap);
+ }
+
}
--
Gitblit v1.8.0