From 6fe3e9841f25481cf78bd1f102886d4ce35e9e17 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 28 Jul 2023 13:38:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/qa' into qa
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 45 ++++++++++++++++++---------------------------
1 files changed, 18 insertions(+), 27 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..2cc538b 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
@@ -30,7 +30,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")
@@ -329,33 +328,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