From ca6b88f52b3d211f3e8e9e379522c35bf56ee9cb Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期二, 07 五月 2024 10:56:15 +0800
Subject: [PATCH] 更新接口文档
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 e191920..b193b73 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
@@ -921,20 +921,20 @@
List<Map<String,Object>> result = new ArrayList();
for(ArdAlarmpointsWell ardAlarmpointsWell : innerList){
Map<String,Object> map = new HashMap();
- double distance_Target = RealDistance(ardCameras.getLongitude(),ardCameras.getLongitude(),ardAlarmpointsWell.getLongitude(), ardAlarmpointsWell.getLatitude());
+ double distance_Target = RealDistance(ardCameras.getLongitude(),ardCameras.getLatitude(),ardAlarmpointsWell.getLongitude(), ardAlarmpointsWell.getLatitude());
- double Angle_A = GetAngle(ardCameras.getLongitude(),ardCameras.getLongitude(),ardAlarmpointsWell.getLongitude(), ardAlarmpointsWell.getLatitude());
+ double Angle_A = GetAngle(ardCameras.getLongitude(),ardCameras.getLatitude(),ardAlarmpointsWell.getLongitude(), ardAlarmpointsWell.getLatitude());
double Angle_E = Math.atan((ardCameras.getAltitude() - 0) / distance_Target) * 180 / Math.PI;
Angle_A = Angle_A - (p - fHorFieldAngle/2);//瑙嗗満瑙掑唴鏂逛綅
-
Angle_E = Angle_E - (360 - t - fVerFieldAngle/2);//瑙嗗満瑙掑唴淇话
-
- map.put("id",ardAlarmpointsWell.getId());
- map.put("wellId",ardAlarmpointsWell.getWellId());
- map.put("horFieldProportion",Angle_A/fHorFieldAngle);//妯悜鍗犳瘮
- map.put("verFieldProportion",Angle_E/fVerFieldAngle);//绾靛悜鍗犳瘮
- result.add(map);
+ if(!(Angle_E/fVerFieldAngle < 0.1 || Angle_A/fHorFieldAngle < 0.08 || Angle_A/fHorFieldAngle > 0.92)){//鏈�涓婏紝鏈�宸︼紝鏈�鍙冲幓鎺�
+ map.put("id",ardAlarmpointsWell.getId());
+ map.put("wellId",ardAlarmpointsWell.getWellId());
+ map.put("horFieldProportion",Angle_A/fHorFieldAngle);//妯悜鍗犳瘮
+ map.put("verFieldProportion",Angle_E/fVerFieldAngle);//绾靛悜鍗犳瘮
+ result.add(map);
+ }
}
return result;
}
--
Gitblit v1.9.3