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 | 104 +++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 50 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 7c9f331..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
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
import org.springblade.core.secure.BladeUser;
@@ -33,15 +34,15 @@
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.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
import org.sxkj.gd.workorder.param.GdPatrolTaskAddParam;
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.GdClueEventVO;
+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;
@@ -50,19 +51,10 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.system.cache.SysCache;
import springfox.documentation.annotations.ApiIgnore;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import javax.servlet.http.HttpServletResponse;
/**
@@ -86,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);
}
/**
@@ -97,11 +89,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdPatrolTask")
public R<IPage<GdPatrolTaskVO>> page(GdPatrolTaskPageParam gdPatrolTask, Query query) {
- IPage<GdPatrolTaskVO> pages = gdPatrolTaskService.selectGdPatrolTaskPage(
- Condition.getPage(query),
- gdPatrolTask,
- SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()))
- );
+ IPage<GdPatrolTaskVO> pages = gdPatrolTaskService.selectGdPatrolTaskPage(Condition.getPage(query), gdPatrolTask);
return R.data(pages);
}
@@ -119,7 +107,6 @@
});
return R.status(gdPatrolTaskService.savePatrolTask(taskEntityList));
}
-
/**
@@ -142,7 +129,7 @@
@ApiIgnore
public void exportGdPatrolTask(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<GdPatrolTaskEntity> queryWrapper = Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class);
- //if (!AuthUtil.isAdministrator()) {
+ // if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(GdPatrolTask::getTenantId, bladeUser.getTenantId());
//}
queryWrapper.lambda().eq(GdPatrolTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
@@ -174,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));
}
/**
@@ -184,7 +171,7 @@
@ApiOperationSupport(order = 12)
@ApiOperation(value = "更新单个巡查任务信息", notes = "传入巡查任务信息")
public R republish(@Valid @RequestBody GdPatrolTaskUpdateParam gdPatrolTask) {
- GdPatrolTaskEntity gdPatrolTaskEntity = Objects.requireNonNull(BeanUtil.copy(gdPatrolTask, GdPatrolTaskEntity.class));
+ GdPatrolTaskEntity gdPatrolTaskEntity = Objects.requireNonNull(BeanUtil.copy(gdPatrolTask, GdPatrolTaskEntity.class));
boolean result = gdPatrolTaskService.republishPatrolTask(gdPatrolTaskEntity);
return R.status(result);
}
@@ -192,44 +179,61 @@
@PostMapping("/export-report")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "导出巡查报告", notes = "传入巡查任务id")
- public R<String> exportReport(@RequestParam Long id) {
+ public R<Boolean> exportReport(@RequestParam Long id) {
if (id == null) {
return R.fail("巡查任务id不能为空");
}
- File reportFile = gdPatrolTaskService.exportPatrolReport(id);
- File savedFile = saveReportToResources(reportFile, id);
- return R.data(savedFile.getAbsolutePath());
+ boolean saved = gdPatrolTaskService.exportPatrolReport(id);
+ return R.data(saved);
}
- private File saveReportToResources(File reportFile, Long patrolTaskId) {
- if (reportFile == null || !reportFile.exists()) {
- throw new RuntimeException("生成的巡查报告文件不存在");
+ @PostMapping("/push-xingtu")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "推送星图任务", notes = "传入巡查任务id")
+ public R pushXingtuTask(@RequestParam Long id) {
+ if (id == null) {
+ return R.fail("巡查任务id不能为空");
}
- Path resourcesDir = resolveResourcesDir();
- String fileName = "gd_patrol_report_" + patrolTaskId + "_" + DateUtil.time() + ".docx";
- Path targetPath = resourcesDir.resolve(fileName);
- try {
- Files.createDirectories(resourcesDir);
- Files.copy(reportFile.toPath(), targetPath, StandardCopyOption.REPLACE_EXISTING);
- return targetPath.toFile();
- } catch (Exception e) {
- throw new RuntimeException("保存巡查报告失败", e);
- }
+ return gdPatrolTaskService.pushXingtuFlyTask(id);
}
- private Path resolveResourcesDir() {
- String userDir = System.getProperty("user.dir");
- if (StringUtil.isBlank(userDir)) {
- throw new RuntimeException("无法获取工作目录");
+ //分享页面缓存数据接口
+ @PostMapping("/share-cache-data")
+ @ApiOperationSupport(order = 15)
+ @ApiOperation(value = "分享页面缓存数据接口", notes = "传入需要缓存的数据")
+ public R<Object> shareCacheData(@RequestBody Object requestData) {
+ if (requestData == null) {
+ return R.fail("缓存的数据不能为空");
}
- Path basePath = Paths.get(userDir);
- if (basePath.endsWith("drone-gd")) {
- return basePath.resolve("src").resolve("main").resolve("resources");
+ // 缓存数据 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不能为空");
}
- if (basePath.endsWith("drone-service")) {
- return basePath.resolve("drone-gd").resolve("src").resolve("main").resolve("resources");
+ 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不能为空");
}
- return basePath.resolve("drone-service").resolve("drone-gd").resolve("src").resolve("main").resolve("resources");
+ List<GdPatrolTaskSimpleVO> list = gdPatrolTaskService.selectListByWorkOrderId(workOrderId);
+ return R.data(list);
}
}
--
Gitblit v1.9.3