From 5579b3cf5d5e2a5b7ec90c89fa843639ba7e2a87 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 27 四月 2023 12:42:17 +0800
Subject: [PATCH] 修改告警和预警数据入库方法

---
 src/main/java/com/yssh/utils/CalculateUtils.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yssh/utils/CalculateUtils.java b/src/main/java/com/yssh/utils/CalculateUtils.java
index 267b97a..4f494c3 100644
--- a/src/main/java/com/yssh/utils/CalculateUtils.java
+++ b/src/main/java/com/yssh/utils/CalculateUtils.java
@@ -49,9 +49,10 @@
 	 * @Description: 缁勮id
 	 */
 	public static List<String> assembleId(List<MonitorPointPosition> checkPoints) {
-		List<String> ids2d = new ArrayList<String>();
+		List<String> ids2d = new ArrayList<>();
 		for (MonitorPointPosition point : checkPoints) {
-			ids2d.add(point.getX() + "_" + point.getY() + "_" + point.getZ());
+			// ids2d.add(point.getX() + "_" + point.getY() + "_" + point.getZ());
+			ids2d.add(point.getX() + "_" + point.getY() + "_" + 0);
 		}
 		return ids2d;
 	}
@@ -66,7 +67,7 @@
 	 * @backup 寮哄埗灏嗗眰绾ф敼涓� 0
 	 */
 	public static List<String> aloneCrosswiseExtend(MonitorPointPosition checkPoint, int range) {
-		List<String> ids = new ArrayList<String>();
+		List<String> ids = new ArrayList<>();
 		Integer x = checkPoint.getX();
 		Integer y = checkPoint.getY();
 		for (int i = x - range / 2; i <= x + range / 2; i++) {
@@ -79,7 +80,7 @@
 	}
 
 	public static List<String> temporary(MonitorPointPosition point, int range) {
-		List<String> ids3d = new ArrayList<String>();
+		List<String> ids3d = new ArrayList<>();
 		Integer x = point.getX();
 		Integer y = point.getY();
 		Integer z = point.getZ();

--
Gitblit v1.9.3