From 0b24d1e0d38a0e07515d71ea43bfaefe1afda257 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 16 三月 2026 13:59:30 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java | 80 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
index cf2a240..9ebecca 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
@@ -18,10 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
@Service("codeService")
@@ -31,6 +28,8 @@
private CodeGapService codeGapService;
@Autowired
private RouteService routeService;
+
+ private static final double STRAIGHT_LINE_SIN_THRESHOLD = 1e-3;
public static final Map<Long, Code> CODE_ID_CACHE = new HashMap<>();
public static final Map<String, Code> CODE_DATA_CACHE = new HashMap<>();
@@ -71,6 +70,69 @@
}
}
return code;
+ }
+
+ @Override
+ public void refreshCornerByCodeIds(List<Long> codeIds) {
+ if (Cools.isEmpty(codeIds)) {
+ return;
+ }
+ Date now = new Date();
+ Set<Long> targets = new HashSet<>(codeIds);
+ for (Long codeId : targets) {
+ Code code = this.getCacheById(codeId);
+ if (null == code) {
+ continue;
+ }
+ boolean corner = shouldMarkAsCorner(code, routeService.getAdjacencyNode(codeId));
+ Integer cornerVal = corner ? 1 : 0;
+ if (!Objects.equals(code.getCorner(), cornerVal)) {
+ code.setCorner(cornerVal);
+ code.setUpdateTime(now);
+ if (!this.updateById(code)) {
+ throw new BusinessException(code.getData() + "鎷愯鏍囪鏇存柊澶辫触");
+ }
+ CODE_ID_CACHE.put(code.getId(), code);
+ CODE_DATA_CACHE.put(code.getData(), code);
+ }
+ }
+ }
+
+ private boolean shouldMarkAsCorner(Code code, List<Long> adjacencyIds) {
+ if (Cools.isEmpty(adjacencyIds)) {
+ return false;
+ }
+ if (adjacencyIds.size() > 2) {
+ return true;
+ }
+ if (adjacencyIds.size() < 2) {
+ return false;
+ }
+ Code first = this.getCacheById(adjacencyIds.get(0));
+ Code second = this.getCacheById(adjacencyIds.get(1));
+ if (null == first || null == second) {
+ return false;
+ }
+ return !isStraightLine(code, first, second);
+ }
+
+ private boolean isStraightLine(Code center, Code first, Code second) {
+ if (center.getX() == null || center.getY() == null
+ || first.getX() == null || first.getY() == null
+ || second.getX() == null || second.getY() == null) {
+ return true;
+ }
+ double v1x = first.getX() - center.getX();
+ double v1y = first.getY() - center.getY();
+ double v2x = second.getX() - center.getX();
+ double v2y = second.getY() - center.getY();
+ double len1 = Math.hypot(v1x, v1y);
+ double len2 = Math.hypot(v2x, v2y);
+ if (len1 == 0 || len2 == 0) {
+ return true;
+ }
+ double sinValue = Math.abs(v1x * v2y - v1y * v2x) / (len1 * len2);
+ return sinValue < STRAIGHT_LINE_SIN_THRESHOLD;
}
@Override
@@ -179,8 +241,8 @@
Double maxY = Double.parseDouble(String.valueOf(map.get("max_y")));
// 缂╂斁鍚庨渶瑕佺殑鍋忕Щ閲�
- double scaleOffsetX = width * (1 -CodeUtils.ADAPTATION_SCALE) / 2;
- double scaleOffsetY = height * (1 -CodeUtils.ADAPTATION_SCALE) / 2;
+ double scaleOffsetX = width * (1 - CodeUtils.ADAPTATION_SCALE) / 2;
+ double scaleOffsetY = height * (1 - CodeUtils.ADAPTATION_SCALE) / 2;
List<Code> codeList = this.list();
for (Code code : codeList) {
@@ -213,7 +275,11 @@
List<Long> ids = this.baseMapper.selectAllLocCode();
List<Code> codeList = new ArrayList<>();
for (Long id : ids) {
- codeList.add(this.getById(id));
+ Code byId = this.getById(id);
+ if (byId != null) {
+ codeList.add(byId);
+ }
+
}
return codeList;
}
--
Gitblit v1.9.1