From 28776b56db3bbd2fbbfd64394e40aa11a6b7ea29 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Wed, 15 Nov 2023 17:30:53 +0800 Subject: [PATCH] fix:补充提交 --- screen-api/src/main/java/com/moral/api/controller/AqiController.java | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 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 3f6071e..c5180e8 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 @@ -8,18 +8,12 @@ import com.moral.api.service.CityAqiDailyService; import com.moral.api.service.CityAqiYearlyService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; +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.*; @@ -30,7 +24,6 @@ import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; import com.moral.util.WebUtils; -import sun.security.util.Resources_sv; @RestController @RequestMapping("/aqi") @@ -61,6 +54,28 @@ return ResultMessage.ok(response); } + @GetMapping("compareO3New") + @ApiOperation(value = "���������������������������New", notes = "���������������������������New") + public ResultMessage compareO3New(@RequestParam @ApiParam(value = "regionCode",name = "������code") String regionCode, + @RequestParam @ApiParam(value = "time",name = "������") String time) { + Map<String, Object> params = new HashMap<>(); + params.put("regionCode",regionCode); + params.put("time",time); + List<Map<String, Object>> response = cityAqiService.measuredCompareForecastOfO3(params); + return ResultMessage.ok(response); + } + + @GetMapping("getO38H") + @ApiOperation(value = "���������������������������New", notes = "���������������������������New") + public ResultMessage getO38H(@RequestParam @ApiParam(value = "regionCode",name = "������code") String regionCode, + @RequestParam @ApiParam(value = "time",name = "������") 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); + return ResultMessage.ok(response); + } + /** * @Description: ���������������6������aqi������ * @Param: [regionCode] -- Gitblit v1.8.0