From 957bccef00652f6f239a9e0dd6f58be4dc37fe09 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 30 四月 2024 08:35:58 +0800
Subject: [PATCH] 视频标签加入范围显示限制修改提交
---
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 d21a2c1..c6c67c1 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
@@ -928,12 +928,13 @@
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.08 || Angle_A/fHorFieldAngle < 0.05 || Angle_A/fHorFieldAngle > 0.95)){//鏈�涓婏紝鏈�宸︼紝鏈�鍙冲幓鎺�
+ 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