From 373663be9204a1ca36cd20a47d0e1487f87bb0a8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 16 十二月 2023 15:15:01 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 78 insertions(+), 3 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..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
@@ -4,11 +4,22 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
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.data.Query;
+import com.ruoyi.utils.pagehelper.JpaPageInfo;
+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 +57,12 @@
@Resource
private IArdAlarmpointsWellService ardAlarmpointsWellService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
+
/**
* 鏌ヨ浜曠鐞嗗垪琛�
*/
@@ -56,6 +73,14 @@
startPage();
List<ArdAlarmpointsWell> list = ardAlarmpointsWellService.selectArdAlarmpointsWellList(ardAlarmpointsWell);
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);
}
/**
@@ -105,7 +130,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());
}
@@ -128,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);
}
@@ -158,4 +183,54 @@
}
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鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+ 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鎴栬�呭綋鍓嶅強鎵�灞炰笅绾х殑鎵�鏈塪eptId
+ List<Long> deptList = sysDeptService.deptIdBySub(sysUser.getDeptId());
+ ardAlarmpointsWellParam.setDeptList(deptList);
+ //鏍规嵁deptId鑾峰彇瀵瑰簲鍏磋叮鐐规暟鎹�
+ return Results.succeed(ardAlarmpointsWellService.conditionList(ardAlarmpointsWellParam));
+ }
+
+ @PostMapping("/getNearbyWells")
+ @ApiOperation("鏌ヨ闄勮繎鐨勬墍鏈変簳")
+ 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));
+ }
+
}
--
Gitblit v1.9.3