From 70b4182fb75db9a5acd234a0ab4c22fd8f93de92 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 14 Apr 2026 18:07:21 +0800
Subject: [PATCH] fix: 成果下载+成果列表+飞手查询所有
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
index a18f921..98396c8 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
@@ -34,6 +34,7 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.common.redis.RedisOpsUtils;
import org.sxkj.gd.common.IdParam;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
@@ -41,6 +42,7 @@
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskUpdateParam;
+import org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.wrapper.GdPatrolTaskWrapper;
@@ -52,10 +54,7 @@
import org.sxkj.system.cache.SysCache;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import javax.servlet.http.HttpServletResponse;
/**
@@ -79,8 +78,8 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdPatrolTask")
public R<GdPatrolTaskVO> detail(GdPatrolTaskEntity gdPatrolTask) {
- GdPatrolTaskEntity detail = gdPatrolTaskService.getOne(Condition.getQueryWrapper(gdPatrolTask));
- return R.data(GdPatrolTaskWrapper.build().entityVO(detail));
+ GdPatrolTaskVO detail = gdPatrolTaskService.getPatrolTaskDetail(gdPatrolTask);
+ return R.data(detail);
}
/**
@@ -162,7 +161,7 @@
GdPatrolTaskEntity auditParam = new GdPatrolTaskEntity();
auditParam.setId(param.getId());
auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
- return R.status(gdPatrolTaskService.updateById(auditParam));
+ return R.status(gdPatrolTaskService.updatePatrolTaskById(auditParam));
}
/**
@@ -197,4 +196,44 @@
}
return gdPatrolTaskService.pushXingtuFlyTask(id);
}
+
+ //分享页面缓存数据接口
+ @PostMapping("/share-cache-data")
+ @ApiOperationSupport(order = 15)
+ @ApiOperation(value = "分享页面缓存数据接口", notes = "传入需要缓存的数据")
+ public R<Object> shareCacheData(@RequestBody Object requestData) {
+ if (requestData == null) {
+ return R.fail("缓存的数据不能为空");
+ }
+ // 缓存数据 7天过过期
+ String cacheKey = UUID.randomUUID().toString();
+ RedisOpsUtils.setWithExpire(cacheKey, requestData, 60 * 60 * 24 * 7);
+ return R.data(cacheKey);
+ }
+
+ @GetMapping("/get-share-cache-data")
+ @ApiOperationSupport(order = 16)
+ @ApiOperation(value = "获取分享页面缓存数据接口", notes = "传入缓存key")
+ public R<Object> getShareCacheData(@RequestParam String cacheKey) {
+ if (cacheKey == null) {
+ return R.fail("缓存key不能为空");
+ }
+ Object cacheData = RedisOpsUtils.get(cacheKey);
+ return R.data(cacheData);
+ }
+
+ /**
+ * 根据工单ID查询巡查任务列表（仅返回id和名称）
+ */
+ @GetMapping("/listByWorkOrderId")
+ @ApiOperationSupport(order = 17)
+ @ApiOperation(value = "根据工单ID查询巡查任务列表", notes = "传入工单ID")
+ public R<List<GdPatrolTaskSimpleVO>> listByWorkOrderId(@ApiParam(value = "工单ID", required = true) @RequestParam Long workOrderId) {
+ if (workOrderId == null) {
+ return R.fail("工单ID不能为空");
+ }
+ List<GdPatrolTaskSimpleVO> list = gdPatrolTaskService.selectListByWorkOrderId(workOrderId);
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3