From f4e20b2dc544a188d0591c901022383e84fa8e9e Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 13 十一月 2023 17:31:03 +0800
Subject: [PATCH] 清淤电磁锁
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 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 7b20289..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
@@ -126,7 +126,13 @@
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);
+ }
/**
* 鎵归噺鍒犻櫎浜曠鐞�
*
@@ -150,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("瀵煎叆浜曟暟鎹笉鑳戒负绌猴紒");
}
@@ -163,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);
@@ -173,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 {
@@ -296,20 +301,22 @@
}
@Override
- public List<ArdAlarmpointsWell> getNearbyWellList(Long deptId, Double[] position, Integer range) {
+ public List<ArdAlarmpointsWell> getNearbyWellList(Double longitudeCenter,Double latitudeCenter, Long deptId, Integer range) {
List<ArdAlarmpointsWell> nearbyWellList = new ArrayList<>();
try {
- 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(position, new Double[]{longitude, latitude});
- if (distance <= range) {
- nearbyWellList.add(well);
+ 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);
+ }
}
}
}
--
Gitblit v1.9.3