From c416eb71aee8d6c6c5138350fc0939e648906210 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 10:47:31 +0800
Subject: [PATCH] opt: 人大金仓数据库改造

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 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 7e4bc48..22e3a7f 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,8 +16,11 @@
  */
 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;
@@ -31,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;
 
 /**
  * 飞手表 服务实现类
@@ -40,24 +43,27 @@
  * @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) {
-		List<Long> deptList = new ArrayList<>();
-		if (!AuthUtil.isAdministrator()) {
-			deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ 		if (!AuthUtil.isAdministrator()) {
+			List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+			gdFlyer.setDeptList(deptList);
 		}
-		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() > 6) {
-				areaCode = areaCode.substring(0, 6);
+			log.info("selectGdFlyerPageareaCode:{}",areaCode);
+			// 去掉前面三位数字
+			if (areaCode != null && areaCode.length() > 3) {
+				areaCode = areaCode.substring(3);
 			}
-			gdFlyer.setAreaCode(areaCode);
+			gdFlyer.setAreaCode(HeaderUtils.fillZero(areaCode));
 		}
+		log.info("selectGdFlyerPageareagdFlyer:{}", JSON.toJSONString(gdFlyer));
 		return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
 	}
 
@@ -71,4 +77,41 @@
 		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