From 9afbe6e5183fbc3dbccb74169e0079d600169f25 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 17:29:38 +0800
Subject: [PATCH] 附件上传优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 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 beaf2f2..1a5c7f2 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
@@ -33,10 +33,13 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.gd.common.IdParam;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+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.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.wrapper.GdPatrolTaskWrapper;
@@ -78,16 +81,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));
- // }
/**
* 巡查任务表 自定义分页
@@ -119,25 +112,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));
- // }
/**
* 巡查任务表 删除
@@ -156,6 +131,7 @@
@GetMapping("/export-gdPatrolTask")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入gdPatrolTask")
+ @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()) {
@@ -177,4 +153,42 @@
return R.status(result);
}
+ /**
+ * 巡查任务执行完成-对外
+ */
+ @PostMapping("/auditExternal")
+ @ApiOperationSupport(order = 11)
+ @ApiOperation(value = "巡查任务执行完成-对外", notes = "只能使用执行完成操作")
+ public R auditExternal(@Valid @RequestBody IdParam param) {
+ if (param.getId() == null) {
+ return R.fail("巡检任务id不能为空");
+ }
+ GdPatrolTaskEntity auditParam = new GdPatrolTaskEntity();
+ auditParam.setId(param.getId());
+ auditParam.setTaskStatus(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue());
+ return R.status(gdPatrolTaskService.updateById(auditParam));
+ }
+
+ /**
+ * 更新单个巡查任务信息
+ */
+ @PostMapping("/republish")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "更新单个巡查任务信息", notes = "传入巡查任务信息")
+ public R republish(@Valid @RequestBody GdPatrolTaskUpdateParam gdPatrolTask) {
+ GdPatrolTaskEntity gdPatrolTaskEntity = Objects.requireNonNull(BeanUtil.copy(gdPatrolTask, GdPatrolTaskEntity.class));
+ boolean result = gdPatrolTaskService.republishPatrolTask(gdPatrolTaskEntity);
+ return R.status(result);
+ }
+
+ @PostMapping("/export-report")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出巡查报告", notes = "传入巡查任务id")
+ public R<Boolean> exportReport(@RequestParam Long id) {
+ if (id == null) {
+ return R.fail("巡查任务id不能为空");
+ }
+ boolean saved = gdPatrolTaskService.exportPatrolReport(id);
+ return R.data(saved);
+ }
}
--
Gitblit v1.9.3