From cfc3023d040325a8f8d19b4c769600dab363f7b7 Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Mon, 13 Jun 2022 16:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=A8=E9=83=A8=E9=81=93=E8=B7=AF=E6=B1=A1=E6=9F=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitormanage/controller/Controller.java  | 22 +++++++++++++++++++
 .../monitormanage/mapper/RoadDataMapper.java  |  3 +++
 .../monitormanage/utils/LongLatUtil.java      |  6 ++---
 src/main/resources/mapper/RoadDataMapper.xml  |  6 +++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java
index f6e790f..ba0b5c0 100644
--- a/src/main/java/com/hisense/monitormanage/controller/Controller.java
+++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java
@@ -1,5 +1,6 @@
 package com.hisense.monitormanage.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hisense.monitormanage.dto.*;
 import com.hisense.monitormanage.entity.*;
 import com.hisense.monitormanage.mapper.*;
@@ -71,6 +72,9 @@ public class Controller {
     @Autowired
     private TrailSanitationMapper trailSanitationMapper;
 
+    @Autowired
+    private RoadDataMapper roadDataMapper;
+
 
     @GetMapping("all")
     public Object all(){
@@ -566,6 +570,24 @@ public class Controller {
         return Result.success(list);
     }
 
+    /**
+     * 分页查询全部道路污染数据
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("selectRoadData")
+    @ApiOperation("分页查询全部道路污染数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "页码", paramType = "query", dataType = "Integer", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "大小", paramType = "query", dataType = "Integer", required = true)
+    })
+    public Result selectRoadData(Integer page,Integer pageSize){
+        List<RoadData> roadData = roadDataMapper.selectRoadData(page,pageSize);
+        Result success = Result.success(roadData);
+        return success;
+    }
+
 
     //查询工地信息，根据经纬度和半径查询
     @GetMapping(value = "listBuildingSiteByPoints")
diff --git a/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java b/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java
index 44918f4..6451cc2 100644
--- a/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java
+++ b/src/main/java/com/hisense/monitormanage/mapper/RoadDataMapper.java
@@ -2,6 +2,7 @@ package com.hisense.monitormanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hisense.monitormanage.entity.RoadData;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -15,4 +16,6 @@ import java.util.Map;
  */
 public interface RoadDataMapper extends BaseMapper<RoadData> {
     public void batchSave(List<Map> list);
+
+    List<RoadData> selectRoadData(@Param("page") Integer page, @Param("pageSize") Integer pageSize);
 }
diff --git a/src/main/java/com/hisense/monitormanage/utils/LongLatUtil.java b/src/main/java/com/hisense/monitormanage/utils/LongLatUtil.java
index 23ac6a7..d76d6b9 100644
--- a/src/main/java/com/hisense/monitormanage/utils/LongLatUtil.java
+++ b/src/main/java/com/hisense/monitormanage/utils/LongLatUtil.java
@@ -36,16 +36,16 @@ public class LongLatUtil {
     /**
      * 根据经纬度和半径计算经纬度范围
      *
-     * @param raidus 单位米
+     * @param radius 单位米
      * @return minLat, minLng, maxLat, maxLng
      */
-    public static double[] getAround(double lon,double lat,  int raidus) {
+    public static double[] getAround(double lon,double lat,  int radius) {
 
         Double latitude = lat;
         Double longitude = lon;
 
         Double degree = (24901 * 1609) / 360.0;
-        double raidusMile = raidus;
+        double raidusMile = radius;
 
         Double dpmLat = 1 / degree;
         Double radiusLat = dpmLat * raidusMile;
diff --git a/src/main/resources/mapper/RoadDataMapper.xml b/src/main/resources/mapper/RoadDataMapper.xml
index e07994d..9f42eb6 100644
--- a/src/main/resources/mapper/RoadDataMapper.xml
+++ b/src/main/resources/mapper/RoadDataMapper.xml
@@ -16,4 +16,10 @@
         </foreach>
     </insert>
 
+    <select id="selectRoadData" resultType="com.hisense.monitormanage.entity.RoadData">
+        select * from t_road_data
+        <bind name="page" value="(page-1)*pageSize"/>
+        limit #{page},#{pageSize}
+    </select>
+
 </mapper>
\ No newline at end of file