From 24c59cc6d46068339f2db6e6083da07810d9653c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 26 Jun 2026 15:48:23 +0800
Subject: [PATCH] feat(GdClueEventController): 添加外部线索事件提交日志记录功能
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdClueEventController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
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 4675cbc..5bd2407 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
@@ -16,6 +16,7 @@
*/
package org.sxkj.gd.workorder.controller;
+import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,6 +24,7 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -32,6 +34,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdClueEventEntity;
import org.sxkj.gd.workorder.param.GdClueEventRejectParam;
+import org.sxkj.gd.workorder.vo.GdClueEventCountVO;
import org.sxkj.gd.workorder.vo.GdClueEventListVO;
import org.sxkj.gd.workorder.vo.GdClueEventVO;
import org.sxkj.gd.workorder.excel.GdClueEventExcel;
@@ -51,6 +54,7 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("workOrder/gdClueEvent")
@@ -76,16 +80,29 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "固定过滤本部门，onlyMine=1时仅我的数据")
public R<List<GdClueEventListVO>> list(@ApiParam(value = "是否仅我的数据，1为是，0为否")
- @RequestParam(value = "onlyMine", required = false, defaultValue = "0") Integer onlyMine) {
- List<GdClueEventListVO> list = gdClueEventService.listGdClueEventByDept(onlyMine);
+ @RequestParam(value = "onlyMine", required = false, defaultValue = "0") Integer onlyMine,
+ @ApiParam(value = "事件编号关键字")
+ @RequestParam(value = "keyword", required = false) String keyword) {
+ List<GdClueEventListVO> list = gdClueEventService.listGdClueEventByDept(onlyMine, keyword);
return R.data(list);
+ }
+
+ /**
+ * 事件表（线索事件） 数量统计
+ */
+ @GetMapping("/count")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "数量统计", notes = "返回全部工单与我的工单数量")
+ public R<GdClueEventCountVO> count(@ApiParam(value = "事件编号关键字")
+ @RequestParam(value = "keyword", required = false) String keyword) {
+ return R.data(gdClueEventService.getGdClueEventCount(keyword));
}
/**
* 事件表（线索事件） 自定义分页
*/
@GetMapping("/page")
- @ApiOperationSupport(order = 3)
+ @ApiOperationSupport(order = 4)
@ApiOperation(value = "分页", notes = "传入gdClueEvent")
public R<IPage<GdClueEventVO>> page(GdClueEventVO gdClueEvent, Query query) {
IPage<GdClueEventVO> pages = gdClueEventService.selectGdClueEventPage(Condition.getPage(query), gdClueEvent);
@@ -123,6 +140,17 @@
}
/**
+ * 事件表（线索事件） 新增或修改-对外接口
+ */
+ @PostMapping("/submitExternal")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入gdClueEvent")
+ public R submitExternal(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
+ log.info("submitExternal-gdClueEvent:{}", JSON.toJSONString(gdClueEvent));
+ return R.status(gdClueEventService.saveOrUpdateExternal(gdClueEvent));
+ }
+
+ /**
* 事件表（线索事件） 删除
*/
@PostMapping("/remove")
@@ -133,13 +161,13 @@
}
/**
- * 事件驳回
+ * 事件处理
*/
- @PostMapping("/reject")
+ @PostMapping("/handle")
@ApiOperationSupport(order = 8)
- @ApiOperation(value = "驳回", notes = "传入事件ID")
- public R reject(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
- return R.status(gdClueEventService.rejectClueEvent(rejectParam));
+ @ApiOperation(value = "处理", notes = "传入事件ID与事件状态")
+ public R handle(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
+ return R.status(gdClueEventService.handleClueEvent(rejectParam));
}
// /**
--
Gitblit v1.9.3