ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
@@ -14,6 +14,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.utils.pagehelper.JpaPageInfo; import com.ruoyi.utils.result.Results; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -80,6 +81,7 @@ List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell); return success(list); } /** * 导出井管理列表 */ @@ -212,13 +214,16 @@ //根据deptId获取对应兴趣点数据 return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam)); } @PostMapping("/getNearbyWells") @ApiOperation("查询附近的所有井") @ApiOperationSupport(includeParameters = {"longitude","latitude","deptId","pageNum","pageSize"}) public TableDataInfo getNearbyWells(ArdAlarmpointsWell ardAlarmpointsWell){ startPage(); List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(ardAlarmpointsWell,1000); return getDataTable(nearbyWellList); public AjaxResult getNearbyWells(Double[] position, Long deptId, Integer pageNum, Integer pageSize) { JpaPageInfo jpaPageInfo = new JpaPageInfo(); jpaPageInfo.setPageNum(pageNum); jpaPageInfo.setPageSize(pageSize); List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(position, deptId, 1000); jpaPageInfo.doPage(nearbyWellList); return AjaxResult.success(jpaPageInfo); } } ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java
@@ -122,5 +122,5 @@ * 刘苏义 * 2023/9/27 10:26:35 */ List<ArdAlarmpointsWell> getNearbyWellList(ArdAlarmpointsWell ardAlarmpointsWell,Integer range); List<ArdAlarmpointsWell> getNearbyWellList(Double[] position, Long deptId,Integer range); } ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -296,12 +296,14 @@ } @Override public List<ArdAlarmpointsWell> getNearbyWellList(ArdAlarmpointsWell ardAlarmpointsWell, Integer range) { public List<ArdAlarmpointsWell> getNearbyWellList(Double[] position, Long deptId, Integer range) { List<ArdAlarmpointsWell> nearbyWellList = new ArrayList<>(); try { Double longitudeCenter = ardAlarmpointsWell.getLongitude(); Double latitudeCenter = ardAlarmpointsWell.getLatitude(); Double longitudeCenter = position[0]; Double latitudeCenter = position[1]; if (longitudeCenter != null && latitudeCenter != null) { ArdAlarmpointsWell ardAlarmpointsWell=new ArdAlarmpointsWell(); ardAlarmpointsWell.setDeptId(deptId); List<ArdAlarmpointsWell> ardAlarmpointsWells = ardAlarmpointsWellMapper.selectArdAlarmpointsWellList(ardAlarmpointsWell); if (ardAlarmpointsWells.size() > 0) { for (ArdAlarmpointsWell well : ardAlarmpointsWells) {
