From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
index 82804fd..90c948b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -26,6 +26,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
+import com.zy.acs.common.utils.News;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -136,12 +137,15 @@
return null;
}
angle = (angle + 360) % 360;
+
+ double result;
double remainder = angle % 45;
if (remainder < 22.5) {
- return angle - remainder;
+ result = angle - remainder;
} else {
- return angle + (45 - remainder);
+ result = angle + (45 - remainder);
}
+ return (result + 360) % 360;
}
// 瑙掑害璁＄畻
@@ -264,7 +268,7 @@
// }
} catch (InterruptedException e) {
- log.error("unlockTaskQueue", e);
+ News.error("unlockTaskQueue", e);
}
}
@@ -728,4 +732,4 @@
return result;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1