From ee138e53a109cfc28aa8565575a944086711094c Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 29 Jun 2023 17:33:55 +0800
Subject: [PATCH] 去除无效内容

---
 screen-api/src/main/java/com/moral/api/controller/AqiController.java |   44 ++++++++++++++++++--------------------------
 1 files changed, 18 insertions(+), 26 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..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
@@ -329,33 +329,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