From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 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 04b984c..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")
@@ -58,6 +51,28 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
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 = "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);
}
@@ -329,33 +344,25 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- CityAreaRangeVO vo = new CityAreaRangeVO();
-
- ConcentrationAndPercent cap = new ConcentrationAndPercent();
- cap.setConcentration("������/������/������");
- cap.setPercent("������");
- cap.setCompareConcentration("������������");
- ConcentrationAndPercent cap2 = new ConcentrationAndPercent();
- cap2.setConcentration("������/������/������");
- cap2.setPercent("������");
-
- vo.setCityName("xxx");
- vo.setRange(0);
- vo.setCompositeIndex(cap);
- vo.setCO(cap);
- vo.setNO2(cap);
- vo.setSO2(cap);
- vo.setPM10(cap);
- vo.setPM25(cap);
- vo.setO3(cap);
- vo.setServerDays(cap2);
- vo.setFineDays(cap2);
-
- List<CityAreaRangeVO> vos = new ArrayList<>();
- vos.add(vo);
- vos.add(vo);
-
+ 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