From c4dbb67b6045e138faf1ab8e5ccbd453bada9d66 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 29 十一月 2023 15:43:56 +0800
Subject: [PATCH] 雷达跟踪引导接收
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 93096ba..9b44f0b 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
@@ -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.data.Query;
import com.ruoyi.utils.pagehelper.JpaPageInfo;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
@@ -152,9 +153,9 @@
@ApiOperation("瀵煎叆浜�")
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
ExcelUtil<ArdAlarmpointsWell> util = new ExcelUtil<ArdAlarmpointsWell>(ArdAlarmpointsWell.class);
- List<ArdAlarmpointsWell> userList = util.importExcel(file.getInputStream());
+ List<ArdAlarmpointsWell> wellList = util.importExcel(file.getInputStream());
String operName = getUsername();
- String message = ardAlarmpointsWellService.importUser(userList, updateSupport, operName);
+ String message = ardAlarmpointsWellService.importWell(wellList, updateSupport, operName);
return success(message);
}
@@ -217,13 +218,19 @@
@PostMapping("/getNearbyWells")
@ApiOperation("鏌ヨ闄勮繎鐨勬墍鏈変簳")
- public AjaxResult getNearbyWells(Double[] position, Long deptId, Integer pageNum, Integer pageSize) {
+ public AjaxResult getNearbyWells(Double longitude,Double latitude, Long deptId, Integer pageNum, Integer pageSize) {
JpaPageInfo jpaPageInfo = new JpaPageInfo();
jpaPageInfo.setPageNum(pageNum);
jpaPageInfo.setPageSize(pageSize);
- List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(position, deptId, 1000);
+ List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(longitude,latitude, deptId, 1000);
jpaPageInfo.doPage(nearbyWellList);
return AjaxResult.success(jpaPageInfo);
}
+ @GetMapping("/getRTUDataYJ8")
+ @ApiOperation("鏌ヨ璁惧杩愯鐘舵��")
+ public AjaxResult getRTUDataYJ8(String wellId){
+ return AjaxResult.success(Query.getRTUDataYJ8(wellId));
+ }
+
}
--
Gitblit v1.9.3