From f5ea859946f70d9d3a50c52fa2bf0c3e9939ba09 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Jul 2026 15:52:00 +0800
Subject: [PATCH] feat(flyer): 添加任务类型匹配标识功能
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 insertions(+), 3 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 315a327..d6f04b0 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,7 +16,13 @@
*/
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;
import org.sxkj.gd.flyer.entity.GdFlyerEntity;
+import org.sxkj.gd.flyer.param.GdFlyerPageParam;
import org.sxkj.gd.flyer.vo.GdFlyerVO;
import org.sxkj.gd.flyer.excel.GdFlyerExcel;
import org.sxkj.gd.flyer.mapper.GdFlyerMapper;
@@ -25,7 +31,11 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.sxkj.gd.utils.GdGeoAddressUtil;
+import org.sxkj.system.cache.SysCache;
+
import java.util.List;
+import java.util.stream.Collectors;
/**
* 飞手表 服务实现类
@@ -33,22 +43,123 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@Service
public class GdFlyerServiceImpl extends BaseServiceImpl<GdFlyerMapper, GdFlyerEntity> implements IGdFlyerService {
+ /**
+ * 分页查询飞手信息列表
+ * @param page 分页对象
+ * @param gdFlyer 查询参数
+ * @return 分页结果
+ */
@Override
- public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerVO gdFlyer) {
- return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
+ public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerPageParam gdFlyer) {
+ // 步骤1：执行数据库查询获取飞手列表
+ List<GdFlyerVO> gdFlyerVOS = baseMapper.selectGdFlyerPage(page, gdFlyer);
+
+ // 步骤2：判断是否有擅长任务类型的查询条件
+ if (StringUtil.isNotBlank(gdFlyer.getSkilledTaskType())) {
+ // 步骤3：获取查询的任务类型
+ String searchTaskType = gdFlyer.getSkilledTaskType();
+
+ // 步骤4：遍历结果，设置匹配标识并根据匹配数量排序
+ gdFlyerVOS.forEach(vo -> {
+ // 步骤5：计算匹配数量
+ int matchCount = countMatchedTaskTypes(vo.getSkilledTaskType(), searchTaskType);
+ // 步骤6：设置匹配标识（匹配数量大于0返回1，否则返回0）
+ vo.setTaskTypeMatchFlag(matchCount > 0 ? 1 : 0);
+ });
+
+ // 步骤7：对结果进行排序，匹配数量多的排在前面
+ gdFlyerVOS.sort((vo1, vo2) -> {
+ // 步骤8：计算记录1匹配的任务类型数量
+ int matchCount1 = countMatchedTaskTypes(vo1.getSkilledTaskType(), searchTaskType);
+ // 步骤9：计算记录2匹配的任务类型数量
+ int matchCount2 = countMatchedTaskTypes(vo2.getSkilledTaskType(), searchTaskType);
+ // 步骤10：匹配数量多的排在前面（降序排列）
+ return Integer.compare(matchCount2, matchCount1);
+ });
+ } else {
+ // 步骤11：无查询条件时，将所有记录的匹配标识设置为0
+ gdFlyerVOS.forEach(vo -> vo.setTaskTypeMatchFlag(0));
+ }
+
+ return page.setRecords(gdFlyerVOS);
+ }
+
+ /**
+ * 计算任务类型列表中匹配的任务类型数量
+ * @param skilledTaskTypes 擅长的任务类型列表（二维数组）
+ * @param searchTaskType 要搜索的任务类型（多个用逗号分隔，如：road4,road5）
+ * @return 匹配的任务类型数量
+ */
+ private int countMatchedTaskTypes(List<List<String>> skilledTaskTypes, String searchTaskType) {
+ // 步骤1：校验参数有效性
+ if (skilledTaskTypes == null || StringUtil.isBlank(searchTaskType)) {
+ return 0;
+ }
+ // 步骤2：拆分多个任务类型（支持逗号分隔）
+ String[] taskTypes = searchTaskType.split(",");
+ // 步骤3：计算匹配数量
+ int matchCount = 0;
+ for (String taskType : taskTypes) {
+ String trimmedTaskType = taskType.trim();
+ // 步骤4：检查二维数组中是否包含该任务类型
+ boolean matched = skilledTaskTypes.stream()
+ .anyMatch(innerList -> innerList != null && innerList.contains(trimmedTaskType));
+ if (matched) {
+ matchCount++;
+ }
+ }
+ return matchCount;
}
@Override
public List<GdFlyerExcel> exportGdFlyer(Wrapper<GdFlyerEntity> queryWrapper) {
List<GdFlyerExcel> gdFlyerList = baseMapper.exportGdFlyer(queryWrapper);
- //gdFlyerList.forEach(gdFlyer -> {
+ // gdFlyerList.forEach(gdFlyer -> {
// gdFlyer.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdFlyer.getType()));
//});
return gdFlyerList;
}
+ /**
+ * 新增或修改
+ * @param convert 飞手实体对象
+ * @return 保存或更新成功返回true，失败返回false
+ */
+ @Override
+ public boolean saveOrUpdateFlyer(GdFlyerEntity convert) {
+ // 步骤1：校验电话号码是否为空
+ if (StringUtil.isNotBlank(convert.getFlyerPhone())) {
+ // 步骤2：查询数据库中是否存在相同电话号码的记录
+ Long count = baseMapper.selectCount(
+ new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<GdFlyerEntity>()
+ .eq(GdFlyerEntity::getFlyerPhone, convert.getFlyerPhone())
+ .ne(convert.getId() != null, GdFlyerEntity::getId, convert.getId())
+ );
+ // 步骤3：如果存在重复的电话号码，抛出异常
+ if (count > 0) {
+ throw new RuntimeException("电话号码已存在，请使用其他电话号码");
+ }
+ }
+ convert.setAreaCode(HeaderUtils.processAreaCode(convert.getRegionCode()));
+ // 步骤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