From 509d655f6c1c70c38cb54ca3e5b0bac3dcfe0020 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Wed, 27 Sep 2023 10:47:48 +0800
Subject: [PATCH] 增加获取附近井接口
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
index e4ac74d..0324f85 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java
@@ -4,11 +4,19 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
+import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellParam;
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -46,6 +54,12 @@
@Resource
private IArdAlarmpointsWellService ardAlarmpointsWellService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
+
/**
* 查询井管理列表
*/
@@ -58,6 +72,13 @@
return getDataTable(list);
}
+ @PreAuthorize("@ss.hasPermi('alarmpoints:well:list')")
+ @GetMapping("/nonPageList")
+ @ApiOperation("查询井列表-不分页")
+ public AjaxResult nonPageList(ArdAlarmpointsWell ardAlarmpointsWell) {
+ List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
+ return success(list);
+ }
/**
* 导出井管理列表
*/
@@ -158,4 +179,44 @@
}
return options;
}
+
+ @GetMapping("/wellById/{id}")
+ @ApiOperation("查询单条兴趣点")
+ public Results wellById(@PathVariable String id) {
+ return Results.succeed(ardAlarmpointsWellService.wellById(id));
+ }
+
+ @PostMapping("/wellList")
+ @ApiOperation("查询权限下所有兴趣点")
+ public Results wellList(){
+ String usersId = SecurityUtils.getUserId();
+ //根据userId查询部门Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ //根据当前deptId或者当前及所属下级的所有deptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ //根据deptId获取对应兴趣点数据
+ List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.wellList(deptList);
+ return Results.succeed(list);
+ }
+
+ @PostMapping("/conditionList")
+ @ApiOperation("查询并筛选权限下所有兴趣点")
+ public Results conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam){
+ String usersId = SecurityUtils.getUserId();
+ //根据userId查询部门Id
+ SysUser sysUser = sysUserService.selectUserById(usersId);
+ //根据当前deptId或者当前及所属下级的所有deptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ ardAlarmpointsWellParam.setDeptList(deptList);
+ //根据deptId获取对应兴趣点数据
+ return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam));
+ }
+ @PostMapping("/getNearbyWells")
+ @ApiOperation("查询附近的所有井")
+ public TableDataInfo getNearbyWells(Long deptId,Double[]position){
+ startPage();
+ List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(deptId,position,1000);
+ return getDataTable(nearbyWellList);
+ }
+
}
--
Gitblit v1.9.3