From ae4e620514b1c1baf94cef706d16c5385fdff837 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 15:04:42 +0800
Subject: [PATCH] 查询飞手优化
---
drone-common/src/main/java/org/sxkj/common/utils/HeaderUtils.java | 9 +++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/IGdFlyerService.java | 6 ++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java | 27 ++++++++++++++++++++++++++-
4 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/drone-common/src/main/java/org/sxkj/common/utils/HeaderUtils.java b/drone-common/src/main/java/org/sxkj/common/utils/HeaderUtils.java
index a63c5ec..71d04ff 100644
--- a/drone-common/src/main/java/org/sxkj/common/utils/HeaderUtils.java
+++ b/drone-common/src/main/java/org/sxkj/common/utils/HeaderUtils.java
@@ -214,6 +214,15 @@
}
/**
+ * 补零
+ * @param areaCode
+ * @return
+ */
+ public static String fillZero(String areaCode) {
+ return areaCode + "000000000000".substring(areaCode.length());
+ }
+
+ /**
* 获取当前HttpServletRequest对象
*
* @return HttpServletRequest对象，可能为null
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java
index 68ba856..c912e1b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java
@@ -93,7 +93,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdFlyer")
public R submit(@Valid @RequestBody GdFlyerAddParam gdFlyer) {
- return R.status(gdFlyerService.saveOrUpdate(GenericConverter.convert(gdFlyer, GdFlyerEntity.class)));
+ return R.status(gdFlyerService.saveOrUpdateFlyer(GenericConverter.convert(gdFlyer, GdFlyerEntity.class)));
}
/**
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/IGdFlyerService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/IGdFlyerService.java
index 2b698e4..12c10a8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/IGdFlyerService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/IGdFlyerService.java
@@ -50,4 +50,10 @@
*/
List<GdFlyerExcel> exportGdFlyer(Wrapper<GdFlyerEntity> queryWrapper);
+ /**
+ *
+ * @param convert
+ * @return
+ */
+ boolean saveOrUpdateFlyer(GdFlyerEntity convert);
}
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 81c6320..3f97cda 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
@@ -18,6 +18,7 @@
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;
@@ -56,7 +57,7 @@
if (areaCode != null && areaCode.length() > 3) {
areaCode = areaCode.substring(3);
}
- gdFlyer.setAreaCode(areaCode);
+ gdFlyer.setAreaCode(HeaderUtils.fillZero(areaCode));
}
return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
@@ -72,4 +73,28 @@
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);
+ }
}
--
Gitblit v1.9.3