From 29dd08effe0fc26c83449d90d0c8d6983affb88d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 15 Apr 2026 10:26:36 +0800
Subject: [PATCH] fix: 成果下载+成果列表+飞手查询所有
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java
index 3f97cda..9d389ad 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java
@@ -16,6 +16,8 @@
*/
package org.sxkj.gd.flyer.service.impl;
+import com.alibaba.fastjson2.JSON;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.utils.HeaderUtils;
@@ -32,8 +34,8 @@
import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.system.cache.SysCache;
-import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 飞手表 服务实现类
@@ -41,25 +43,12 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@Service
public class GdFlyerServiceImpl extends BaseServiceImpl<GdFlyerMapper, GdFlyerEntity> implements IGdFlyerService {
@Override
public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerPageParam gdFlyer) {
- if (!AuthUtil.isAdministrator()) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- gdFlyer.setDeptList(deptList);
- }
- // 通过经纬度获取行政区划
- if (StringUtil.isNotBlank(gdFlyer.getLongitude()) && StringUtil.isNotBlank(gdFlyer.getLatitude())) {
- String areaCode = GdGeoAddressUtil.getCountyCode(Double.valueOf(gdFlyer.getLongitude()), Double.valueOf(gdFlyer.getLatitude()));
- // 去掉前面三位数字
- if (areaCode != null && areaCode.length() > 3) {
- areaCode = areaCode.substring(3);
- }
- gdFlyer.setAreaCode(HeaderUtils.fillZero(areaCode));
- }
-
return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
}
@@ -97,4 +86,17 @@
// 步骤4：执行保存或更新操作
return saveOrUpdate(convert);
}
+
+ @Override
+ public List<String> selectAllFlyerIds() {
+ List<GdFlyerEntity> flyerList = lambdaQuery()
+ .eq(GdFlyerEntity::getIsDeleted, 0)
+ .select(GdFlyerEntity::getFlyerId)
+ .list();
+ return flyerList.stream()
+ .map(GdFlyerEntity::getFlyerId)
+ .filter(StringUtil::isNotBlank)
+ .distinct()
+ .collect(Collectors.toList());
+ }
}
--
Gitblit v1.9.3