From a48221b7377fc843f3e9fd9afadcc9e0db3e0394 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 14:44:22 +0800
Subject: [PATCH] 机构和区划接口优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 31 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 7b4929c..7c9f331 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
@@ -50,9 +50,15 @@
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;
@@ -83,16 +89,6 @@
GdPatrolTaskEntity detail = gdPatrolTaskService.getOne(Condition.getQueryWrapper(gdPatrolTask));
return R.data(GdPatrolTaskWrapper.build().entityVO(detail));
}
- /**
- * 巡查任务表 分页
- */
- // @GetMapping("/list")
- // @ApiOperationSupport(order = 2)
- // @ApiOperation(value = "分页", notes = "传入gdPatrolTask")
- // public R<IPage<GdPatrolTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, Query query) {
- // IPage<GdPatrolTaskEntity> pages = gdPatrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class));
- // return R.data(GdPatrolTaskWrapper.build().pageVO(pages));
- // }
/**
* 巡查任务表 自定义分页
@@ -124,25 +120,7 @@
return R.status(gdPatrolTaskService.savePatrolTask(taskEntityList));
}
- /**
- * 巡查任务表 修改
- */
- // @PostMapping("/update")
- // @ApiOperationSupport(order = 5)
- // @ApiOperation(value = "修改", notes = "传入gdPatrolTask")
- // public R update(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
- // return R.status(gdPatrolTaskService.updateById(gdPatrolTask));
- // }
- /**
- * 巡查任务表 新增或修改
- */
- // @PostMapping("/submit")
- // @ApiOperationSupport(order = 6)
- // @ApiOperation(value = "新增或修改", notes = "传入gdPatrolTask")
- // public R submit(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
- // return R.status(gdPatrolTaskService.saveOrUpdate(gdPatrolTask));
- // }
/**
* 巡查任务表 删除
@@ -184,10 +162,10 @@
}
/**
- * 审核巡查任务
+ * 巡查任务执行完成-对外
*/
@PostMapping("/auditExternal")
- @ApiOperationSupport(order = 10)
+ @ApiOperationSupport(order = 11)
@ApiOperation(value = "巡查任务执行完成-对外", notes = "只能使用执行完成操作")
public R auditExternal(@Valid @RequestBody IdParam param) {
if (param.getId() == null) {
@@ -203,7 +181,7 @@
* 更新单个巡查任务信息
*/
@PostMapping("/republish")
- @ApiOperationSupport(order = 11)
+ @ApiOperationSupport(order = 12)
@ApiOperation(value = "更新单个巡查任务信息", notes = "传入巡查任务信息")
public R republish(@Valid @RequestBody GdPatrolTaskUpdateParam gdPatrolTask) {
GdPatrolTaskEntity gdPatrolTaskEntity = Objects.requireNonNull(BeanUtil.copy(gdPatrolTask, GdPatrolTaskEntity.class));
@@ -211,4 +189,47 @@
return R.status(result);
}
+ @PostMapping("/export-report")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出巡查报告", notes = "传入巡查任务id")
+ public R<String> 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());
+ }
+
+ private File saveReportToResources(File reportFile, Long patrolTaskId) {
+ if (reportFile == null || !reportFile.exists()) {
+ throw new RuntimeException("生成的巡查报告文件不存在");
+ }
+ 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);
+ }
+ }
+
+ private Path resolveResourcesDir() {
+ String userDir = System.getProperty("user.dir");
+ if (StringUtil.isBlank(userDir)) {
+ throw new RuntimeException("无法获取工作目录");
+ }
+ Path basePath = Paths.get(userDir);
+ if (basePath.endsWith("drone-gd")) {
+ return basePath.resolve("src").resolve("main").resolve("resources");
+ }
+ if (basePath.endsWith("drone-service")) {
+ return basePath.resolve("drone-gd").resolve("src").resolve("main").resolve("resources");
+ }
+ return basePath.resolve("drone-service").resolve("drone-gd").resolve("src").resolve("main").resolve("resources");
+ }
+
}
--
Gitblit v1.9.3