From ddc89794e706cd35e2f43543a345148e30a0a91f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 03 Jan 2023 16:42:21 +0800
Subject: [PATCH] 修改浑南模板格式问题
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 fdfeaca..3f6071e 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
@@ -14,6 +14,7 @@
import io.swagger.annotations.ApiOperation;
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;
@@ -311,8 +312,42 @@
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- List<Map<String, Object>> resultList = cityAqiService.momData(regionCode, size, current, orgId);
- return ResultMessage.ok(resultList);
+ 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