From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
index 88dd83a..5ca079d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java
@@ -237,6 +237,28 @@
}
@Override
+ public String selectAreaNameByDeviceId(Long deviceId) {
+ if (deviceId == null) {
+ return "";
+ }
+ List<FwAreaDivideVO> areaList = baseMapper.selectFwAreaDivideListByDeviceIds(Collections.singletonList(deviceId));
+ if (areaList == null || areaList.isEmpty()) {
+ return "";
+ }
+ Set<String> areaNameSet = new LinkedHashSet<>();
+ for (FwAreaDivideVO area : areaList) {
+ if (area == null || StringUtil.isBlank(area.getAreaName())) {
+ continue;
+ }
+ areaNameSet.add(area.getAreaName().trim());
+ }
+ if (areaNameSet.isEmpty()) {
+ return "";
+ }
+ return String.join(",", areaNameSet);
+ }
+
+ @Override
public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
if (!AuthUtil.isAdministrator()) {
--
Gitblit v1.9.3