From d5585386672ada51f91ff0d2c3db842b72d4e418 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 15:33:09 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java | 24 ++++++++++++++++++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java | 11 +++++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java | 2 +-
drone-common/src/main/java/org/sxkj/common/constant/WordOrderConstant.java | 2 ++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 2 +-
5 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/drone-common/src/main/java/org/sxkj/common/constant/WordOrderConstant.java b/drone-common/src/main/java/org/sxkj/common/constant/WordOrderConstant.java
index fcee7d8..47eba23 100644
--- a/drone-common/src/main/java/org/sxkj/common/constant/WordOrderConstant.java
+++ b/drone-common/src/main/java/org/sxkj/common/constant/WordOrderConstant.java
@@ -8,6 +8,8 @@
String PATROL_TASK_PREFIX = "RW";
//线索事件编号前缀
String EVENT_NUM_PREFIX = "XS";
+ //线索事件编号前缀
+ String SJ_EVENT_NUM_PREFIX = "SJ";
// 机构前缀
String ORG_PREFIX = "JG";
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
index 69b7309..3e11ab4 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java
@@ -143,7 +143,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdClueEvent")
public R submitExternal(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
- return R.status(gdClueEventService.saveOrUpdate(gdClueEvent));
+ return R.status(gdClueEventService.saveOrUpdateExternal(gdClueEvent));
}
/**
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index 6b85919..226558d 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -130,7 +130,7 @@
COALESCE(tr.shoot_time, ce.shoot_time) as shoot_time,
COALESCE(tr.result_url, ce.attach_url) as event_image_url,
COALESCE(tr.geojson, ce.geojson) as geojson,
- COALESCE(tr.attachment_type, ce.attachment_type) as attachment_type
+ COALESCE(tr.attachment_type, ce.attachment_type) as attachmentType
from ja_gd_clue_event ce
left join blade_user bu on bu.id::VARCHAR = ce.dispose_user::VARCHAR and bu.is_deleted = 0
left join blade_dept bd on bd.id::VARCHAR = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
index f3757b2..6c32d08 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdClueEventService.java
@@ -100,4 +100,15 @@
*/
List<GdClueEventExcel> exportGdClueEvent(Wrapper<GdClueEventEntity> queryWrapper);
+ /**
+ * 对外接口新增或修改事件
+ * <p>
+ * 生成事件编号并保存或更新事件信息
+ * </p>
+ *
+ * @param gdClueEvent 事件实体
+ * @return 是否操作成功
+ */
+ boolean saveOrUpdateExternal(GdClueEventEntity gdClueEvent);
+
}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
index 0eacb76..d4f13fa 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java
@@ -192,4 +192,28 @@
return gdClueEventList;
}
+ /**
+ * 对外接口新增或修改事件
+ * <p>
+ * 步骤：
+ * 1. 生成事件编号（使用SJ前缀）
+ * 2. 设置事件编号到实体
+ * 3. 保存或更新事件信息
+ * </p>
+ *
+ * @param gdClueEvent 事件实体
+ * @return 是否操作成功
+ */
+ @Override
+ public boolean saveOrUpdateExternal(GdClueEventEntity gdClueEvent) {
+ // 1. 生成事件编号
+ String times = OrderNumUtils.initOrderNum(WordOrderConstant.EVENT_NUM_KEY);
+ String eventNum = WordOrderConstant.SJ_EVENT_NUM_PREFIX + times;
+ // 2. 设置事件编号
+ gdClueEvent.setEventNum(eventNum);
+ gdClueEvent.setCreateTime(new Date());
+ // 3. 保存或更新
+ return saveOrUpdate(gdClueEvent);
+ }
+
}
--
Gitblit v1.9.3