From a13dc532aa93bfa9ce5c3c01323e00869f4f0b76 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Tue, 27 Feb 2024 14:01:23 +0800
Subject: [PATCH] 大华setPTZ1调用普通方法
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 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 e6545e8..8a8c4ba 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
@@ -9,11 +9,15 @@
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.SysConfig;
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.ISysConfigService;
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;
import io.swagger.annotations.ApiOperation;
@@ -61,6 +65,9 @@
@Autowired
private ISysDeptService sysDeptService;
+ @Autowired
+ private ISysConfigService sysConfigService;
+
/**
* 查询井管理列表
*/
@@ -80,6 +87,7 @@
List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
return success(list);
}
+
/**
* 导出井管理列表
*/
@@ -127,7 +135,7 @@
@ApiOperation("修改井")
public AjaxResult edit(@RequestBody ArdAlarmpointsWell ardAlarmpointsWell) {
try {
- return toAjax(ardAlarmpointsWellService.updateArdAlarmpointsWell(ardAlarmpointsWell));
+ return toAjax(ardAlarmpointsWellService.updateArdAlarmpointsWell(ardAlarmpointsWell));
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
@@ -150,9 +158,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);
}
@@ -189,7 +197,7 @@
@PostMapping("/wellList")
@ApiOperation("查询权限下所有兴趣点")
- public Results wellList(){
+ public Results wellList() {
String usersId = SecurityUtils.getUserId();
//根据userId查询部门Id
SysUser sysUser = sysUserService.selectUserById(usersId);
@@ -202,7 +210,7 @@
@PostMapping("/conditionList")
@ApiOperation("查询并筛选权限下所有兴趣点")
- public Results conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam){
+ public Results conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam) {
String usersId = SecurityUtils.getUserId();
//根据userId查询部门Id
SysUser sysUser = sysUserService.selectUserById(usersId);
@@ -212,13 +220,48 @@
//根据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 longitude,Double latitude, Long deptId, Integer pageNum, Integer pageSize) {
+ JpaPageInfo jpaPageInfo = new JpaPageInfo();
+ jpaPageInfo.setPageNum(pageNum);
+ jpaPageInfo.setPageSize(pageSize);
+ 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));
+ }
+
+ @GetMapping("/getWellDataByWellId")
+ @ApiOperation("查询设备动静态属性")
+ public AjaxResult getWellData(String wellId){
+ SysConfig config = new SysConfig();
+ config.setConfigKey("3coracle");
+ List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
+ Map<String,Object> result = ardAlarmpointsWellService.getWellDataByWellId(wellId,sysConfigResult);
+ return AjaxResult.success(result);
+ }
+
+ @GetMapping("/getWellDataByPatrolplanIdAndPosition")
+ @ApiOperation("查询最近巡检设备动静态属性")
+ public AjaxResult getWellDataByPatrolplanIdAndPosition(@RequestBody Map<String,Object> para){
+ SysConfig config = new SysConfig();
+ config.setConfigKey("3coracle");
+ List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
+ Map<String,Object> result = ardAlarmpointsWellService.getWellDataByPatrolplanIdAndPosition(para,sysConfigResult);
+ return AjaxResult.success(result);
+ }
+
+ @GetMapping("/getWellById")
+ @ApiOperation("根据查询兴趣点基本属性")
+ public AjaxResult getWellById(@RequestBody Map<String,String> para){
+ ArdAlarmpointsWell result = ardAlarmpointsWellService.getWellById(para.get("id"));
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3