From 59adc3dbb396facc71b1fcc03eec24d059726f68 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 20:41:39 +0800
Subject: [PATCH] add : 吉安接口放行

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdClueEventServiceImpl.java |   47 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 41 insertions(+), 6 deletions(-)

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 c839b66..5441dab 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
@@ -19,8 +19,11 @@
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.common.constant.WordOrderConstant;
+import org.sxkj.common.utils.OrderNumUtils;
 import org.sxkj.gd.workorder.entity.GdClueEventEntity;
 import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
 import org.sxkj.gd.workorder.excel.GdClueEventExcel;
@@ -46,6 +49,7 @@
  * @author lw
  * @since 2026-01-14
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 public class GdClueEventServiceImpl extends BaseServiceImpl<GdClueEventMapper, GdClueEventEntity> implements IGdClueEventService {
@@ -63,11 +67,11 @@
 	}
 
 	@Override
-	public List<GdClueEventListVO> listGdClueEventByDept(Integer onlyMine) {
+	public List<GdClueEventListVO> listGdClueEventByDept(Integer onlyMine, String keyword) {
 		Long deptId = Long.valueOf(AuthUtil.getDeptId());
 		Long userId = AuthUtil.getUserId();
 		Integer mine = onlyMine == null ? 0 : onlyMine;
-		return baseMapper.selectGdClueEventSimpleList(deptId, userId, mine);
+		return baseMapper.selectGdClueEventSimpleList(deptId, userId, mine, keyword);
 	}
 
 	@Override
@@ -81,6 +85,7 @@
 			throw new RuntimeException("事件不存在");
 		}
 		String address = GdGeoAddressUtil.getFormattedAddress(detail.getLongitude(), detail.getLatitude());
+		log.info("地址：{}", address);
 		if (StringUtil.isNotBlank(address)) {
 			detail.setEventLocation(address);
 		}
@@ -88,10 +93,10 @@
 	}
 
 	@Override
-	public GdClueEventCountVO getGdClueEventCount() {
+	public GdClueEventCountVO getGdClueEventCount(String keyword) {
 		Long deptId = Long.valueOf(AuthUtil.getDeptId());
 		Long userId = AuthUtil.getUserId();
-		GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId);
+		GdClueEventCountVO countVO = baseMapper.selectGdClueEventCount(deptId, userId, keyword);
 		if (countVO == null) {
 			GdClueEventCountVO empty = new GdClueEventCountVO();
 			empty.setTotalCount(0L);
@@ -119,6 +124,9 @@
 		clueEvent.setLongitude(distributeParam.getLongitude());
 		clueEvent.setLatitude(distributeParam.getLatitude());
 		clueEvent.setEventStatus(1);
+		String times = OrderNumUtils.initOrderNum(WordOrderConstant.EVENT_NUM_KEY);
+		String eventNum = WordOrderConstant.EVENT_NUM_PREFIX + times;
+		clueEvent.setEventNum(eventNum);
 		if (StringUtil.isBlank(distributeParam.getAreaCode())) {
 			clueEvent.setAreaCode(taskResult.getAreaCode());
 		} else {
@@ -127,13 +135,14 @@
 		clueEvent.setCreateUser(AuthUtil.getUserId());
 		clueEvent.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 		clueEvent.setCreateTime(new Date());
+		clueEvent.setEventName(distributeParam.getEventName());
 		if (!save(clueEvent)) {
 			throw new RuntimeException("事件分发失败");
 		}
 		taskResult.setDistributeStatus(1);
 		taskResult.setUpdateUser(AuthUtil.getUserId());
 		taskResult.setUpdateTime(new Date());
-		if (!gdTaskResultService.updateById(taskResult)) {
+		if (!gdTaskResultService.updateTaskResultById(taskResult)) {
 			throw new RuntimeException("成果状态更新失败");
 		}
 		return true;
@@ -164,10 +173,11 @@
 		if (taskResult == null || (taskResult.getIsDeleted() != null && taskResult.getIsDeleted() != 0)) {
 			throw new RuntimeException("成果不存在");
 		}
+		// 使用XML方式更新成果信息（更新所有字段）
 		taskResult.setDistributeStatus(targetStatus);
 		taskResult.setUpdateUser(AuthUtil.getUserId());
 		taskResult.setUpdateTime(new Date());
-		if (!gdTaskResultService.updateById(taskResult)) {
+		if (!gdTaskResultService.updateTaskResultById(taskResult)) {
 			throw new RuntimeException("成果状态更新失败");
 		}
 		return true;
@@ -182,4 +192,29 @@
 		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());
+		gdClueEvent.setEventStatus(1);
+		// 3. 保存或更新
+		return saveOrUpdate(gdClueEvent);
+	}
+
 }

--
Gitblit v1.9.3