From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 91 ++++++++++++++++++++++++++++++---------------
1 files changed, 60 insertions(+), 31 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
index 7a1d553..70182f0 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.alarmpoints.well.service.impl;
+import java.util.ArrayList;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +20,7 @@
import com.ruoyi.common.utils.bean.BeanValidators;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.utils.gis.GisUtil;
import lombok.ToString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +44,7 @@
private ArdAlarmpointsWellMapper ardAlarmpointsWellMapper;
@Autowired
protected Validator validator;
+
/**
* 鏌ヨ浜曠鐞�
*
@@ -52,6 +55,7 @@
public ArdAlarmpointsWell selectArdAlarmpointsWellById(String id) {
return ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(id);
}
+
/**
* 鏌ヨ浜曠鐞�
*
@@ -70,18 +74,17 @@
* @return 浜曠鐞�
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAlarmpointsWell> selectArdAlarmpointsWellList(ArdAlarmpointsWell ardAlarmpointsWell) {
return ardAlarmpointsWellMapper.selectArdAlarmpointsWellList(ardAlarmpointsWell);
}
/**
- *
* @param ardAlarmpointsWell 鎸変簳缂栧彿鏌ヨ
* @return
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAlarmpointsWell> selectArdAlarmpointsWellByWellIdLike(ArdAlarmpointsWell ardAlarmpointsWell) {
return ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellIdLike(ardAlarmpointsWell);
}
@@ -96,8 +99,7 @@
@Transactional
public int insertArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell) {
boolean wellIdExists = checkWellIdExists(ardAlarmpointsWell);
- if(wellIdExists)
- {
+ if (wellIdExists) {
throw new RuntimeException("浜曞彿宸插瓨鍦�");
}
ardAlarmpointsWell.setId(IdUtils.simpleUUID());
@@ -117,15 +119,20 @@
@Transactional
public int updateArdAlarmpointsWell(ArdAlarmpointsWell ardAlarmpointsWell) {
boolean wellIdExists = checkWellIdExists(ardAlarmpointsWell);
- if(wellIdExists)
- {
+ if (wellIdExists) {
throw new RuntimeException("浜曞彿宸插瓨鍦�");
}
ardAlarmpointsWell.setUpdateBy(SecurityUtils.getUsername());
ardAlarmpointsWell.setUpdateTime(DateUtils.getNowDate());
return ardAlarmpointsWellMapper.updateArdAlarmpointsWell(ardAlarmpointsWell);
}
-
+ @Override
+ @Transactional
+ public int updateArdAlarmpointsWellByWellId(ArdAlarmpointsWell ardAlarmpointsWell) {
+ ardAlarmpointsWell.setUpdateBy(SecurityUtils.getUsername());
+ ardAlarmpointsWell.setUpdateTime(DateUtils.getNowDate());
+ return ardAlarmpointsWellMapper.updateArdAlarmpointsWellByWellId(ardAlarmpointsWell);
+ }
/**
* 鎵归噺鍒犻櫎浜曠鐞�
*
@@ -149,7 +156,7 @@
}
@Override
- public String importUser(List<ArdAlarmpointsWell> ardAlarmpointsWellList, Boolean isUpdateSupport, String operName) {
+ public String importWell(List<ArdAlarmpointsWell> ardAlarmpointsWellList, Boolean isUpdateSupport, String operName) {
if (StringUtils.isNull(ardAlarmpointsWellList) || ardAlarmpointsWellList.size() == 0) {
throw new ServiceException("瀵煎叆浜曟暟鎹笉鑳戒负绌猴紒");
}
@@ -162,9 +169,9 @@
//鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
String userId = SecurityUtils.getUserId();
well.setUserId(userId);
- // 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
- ArdAlarmpointsWell u = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(well.getWellId());
- if (StringUtils.isNull(u)) {
+ // 楠岃瘉鏄惁瀛樺湪杩欎釜浜�
+ ArdAlarmpointsWell w = ardAlarmpointsWellMapper.selectArdAlarmpointsWellByWellId(well.getWellId());
+ if (StringUtils.isNull(w)) {
BeanValidators.validateWithException(validator, well);
well.setCreateBy(operName);
this.insertArdAlarmpointsWell(well);
@@ -172,10 +179,9 @@
successMsg.append("<br/>" + successNum + "銆佷簳鍙� " + well.getWellId() + " 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
BeanValidators.validateWithException(validator, well);
- checkWellAllowed(well);
checkWellDataScope(well.getUserId());
well.setUpdateBy(operName);
- this.updateArdAlarmpointsWell(well);
+ this.updateArdAlarmpointsWellByWellId(well);
successNum++;
successMsg.append("<br/>" + successNum + "銆佷簳鍙� " + well.getWellId() + " 鏇存柊鎴愬姛");
} else {
@@ -204,10 +210,8 @@
* @param well 浜曚俊鎭�
*/
@Override
- public void checkWellAllowed(ArdAlarmpointsWell well)
- {
- if (StringUtils.isNotNull(well.getId()))
- {
+ public void checkWellAllowed(ArdAlarmpointsWell well) {
+ if (StringUtils.isNotNull(well.getId())) {
throw new ServiceException("涓嶅厑璁告搷浣滀簳");
}
}
@@ -218,23 +222,21 @@
* @param userId 鐢ㄦ埛id
*/
@Override
- public void checkWellDataScope(String userId)
- {
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
- {
+ public void checkWellDataScope(String userId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
ArdAlarmpointsWell well = new ArdAlarmpointsWell();
well.setUserId(userId);
List<ArdAlarmpointsWell> wells = SpringUtils.getAopProxy(this).selectArdAlarmpointsWellList(well);
- if (StringUtils.isEmpty(wells))
- {
+ if (StringUtils.isEmpty(wells)) {
throw new ServiceException("娌℃湁鏉冮檺璁块棶浜曟暟鎹紒");
}
}
}
+
/**
* 鏍稿浜曞彿鏄惁鍞竴
*
- * @param wellId 闇�瑕佹牳瀵圭殑浜曞彿
+ * @param well 闇�瑕佹牳瀵圭殑浜�
* @return 缁撴灉
*/
@Override
@@ -254,7 +256,7 @@
@Override
public List<ArdAlarmpointsWell> wellByDeptList(List<Long> deptList) {
QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
- queryWrapper.in("dept_id",deptList);
+ queryWrapper.in("dept_id", deptList);
return ardAlarmpointsWellMapper.selectList(queryWrapper);
}
@@ -266,18 +268,18 @@
@Override
public List<ArdAlarmpointsWell> wellList(List<Long> deptList) {
QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("id","well_id","oil_production","longitude","latitude","altitude").in("dept_id",deptList);
+ queryWrapper.select("id", "well_id", "oil_production", "longitude", "latitude", "altitude").in("dept_id", deptList);
return ardAlarmpointsWellMapper.selectList(queryWrapper);
}
@Override
- public PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam){
+ public PageInfo<ArdAlarmpointsWell> conditionList(ArdAlarmpointsWellParam ardAlarmpointsWellParam) {
Integer pageNum = ardAlarmpointsWellParam.getPageNum();
Integer pageSize = ardAlarmpointsWellParam.getPageSize();
- PageHelper.startPage(pageNum,pageSize);
+ PageHelper.startPage(pageNum, pageSize);
QueryWrapper<ArdAlarmpointsWell> queryWrapper = new QueryWrapper<>();
- queryWrapper.in("dept_id",ardAlarmpointsWellParam.getDeptList())
- .like(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()),"well_id",ardAlarmpointsWellParam.getWellId());
+ queryWrapper.in("dept_id", ardAlarmpointsWellParam.getDeptList())
+ .like(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellId()), "well_id", ardAlarmpointsWellParam.getWellId());
// .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellNumber()),"well_number",ardAlarmpointsWellParam.getWellNumber())
// .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getOilProduction()),"oil_production",ardAlarmpointsWellParam.getOilProduction())
// .eq(!StringUtils.isBlank(ardAlarmpointsWellParam.getWellBlock()),"well_block",ardAlarmpointsWellParam.getWellBlock())
@@ -297,4 +299,31 @@
public List<ArdAlarmpointsWellDeptVo> wellListDept(List<Long> deptList) {
return ardAlarmpointsWellMapper.wellListDept(deptList);
}
+
+ @Override
+ public List<ArdAlarmpointsWell> getNearbyWellList(Double longitudeCenter,Double latitudeCenter, Long deptId, Integer range) {
+ List<ArdAlarmpointsWell> nearbyWellList = new ArrayList<>();
+ try {
+ 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) {
+ Double longitude = well.getLongitude();
+ Double latitude = well.getLatitude();
+ if (longitude != null && latitude != null) {
+ double distance = GisUtil.getDistance(new Double[]{longitudeCenter, latitudeCenter}, new Double[]{longitude, latitude});
+ if (distance <= range) {
+ nearbyWellList.add(well);
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception ex) {
+ log.error("鑾峰彇闄勮繎浜曞紓甯革細" + ex.getMessage());
+ }
+ return nearbyWellList;
+ }
}
--
Gitblit v1.9.3