From 8144c42f05b553f789e9c86430cdea81e81229a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Mar 2022 17:26:10 +0800
Subject: [PATCH] screen.iml删除
---
screen-api/src/main/java/com/moral/api/controller/AqiController.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 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..04b984c 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,50 @@
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());
+ }
+ 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);
+
+ return ResultMessage.ok(vos);
}
}
--
Gitblit v1.8.0