From 68e22957db996437fa20a9a4aa5ff37c54d4056f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:25 +0800
Subject: [PATCH] chore:补充提交

---
 screen-api/src/main/java/com/moral/api/controller/AqiController.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 2cc538b..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.*;
 
@@ -60,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