From ccffb1cf1c4312daa2b5291e13ef944486b36e54 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Fri, 2 Feb 2024 19:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DevopsVideoInfoController.java       | 13 +++++++++++++
 .../controller/MetaActualUserInfoController.java    | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java
index 55c6f3f..63af842 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java
+++ b/gather-app/src/main/java/com/ruoyi/database/controller/DevopsVideoInfoController.java
@@ -4,9 +4,12 @@ package com.ruoyi.database.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.business.domain.dto.DevopsVideoInfoDto;
 import com.ruoyi.common.utils.StringKit;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.database.domain.DevopsVideoInfo;
 import com.ruoyi.database.domain.DevopsVideoStatus;
+import com.ruoyi.database.domain.MetaActualUnitInfo;
 import com.ruoyi.database.domain.dto.VideoDTO;
+import com.ruoyi.database.domain.vo.MetaActualUnitInfoVO;
 import com.ruoyi.database.service.DevopsVideoInfoService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -170,4 +173,14 @@ public class DevopsVideoInfoController extends BaseController {
         }
     }
 
+    @GetMapping("/distance")
+    @ApiOperation("周边视频列表")
+    public AjaxResult peripheryVideo(DevopsVideoInfo devopsVideoInfo) {
+        List<DevopsVideoInfo> list = devopsVideoInfoService.lambdaQuery()
+                .between(DevopsVideoInfo::getLatitude, devopsVideoInfo.getLatitude() - 0.0005, devopsVideoInfo.getLatitude() + 0.0005)
+                .between(DevopsVideoInfo::getLongitude, devopsVideoInfo.getLongitude() - 0.0005, devopsVideoInfo.getLongitude() + 0.0005)
+                .list();
+        return AjaxResult.success(list);
+    }
+
 }
diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java
index dbd1fbe..23efea1 100644
--- a/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java
+++ b/gather-app/src/main/java/com/ruoyi/database/controller/MetaActualUserInfoController.java
@@ -3,6 +3,7 @@ package com.ruoyi.database.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.database.domain.MetaActualUserInfo;
+import com.ruoyi.database.domain.MetaRealEstateInfo;
 import com.ruoyi.database.service.MetaActualUserInfoService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -10,8 +11,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.database.service.MetaRealEstateInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +35,7 @@ import java.util.List;
 public class MetaActualUserInfoController extends BaseController {
 
     private final MetaActualUserInfoService metaActualUserInfoService;
+    private final MetaRealEstateInfoService metaRealEstateInfoService;
 
     @GetMapping
     @ApiOperation("查询实有人口信息表")
@@ -67,6 +71,15 @@ public class MetaActualUserInfoController extends BaseController {
         return getDataTable(list);
     }
 
+
+    @PostMapping("/house")
+    @ApiOperation("根据人口住址查地址经纬度")
+    public AjaxResult houseList(@ApiParam("住址") @RequestParam String para) {
+        List<MetaRealEstateInfo> list = metaRealEstateInfoService.lambdaQuery().eq(MetaRealEstateInfo::getRealEstateAddress, para).list();
+        MetaRealEstateInfo metaRealEstateInfo = list.get(0);
+        return AjaxResult.success(metaRealEstateInfo);
+    }
+
     @PostMapping
     @ApiOperation("新增实有人口信息表")
     @Log(title = "实有人口信息表", businessType = BusinessType.INSERT)