From ff2ee260472e3b43c6dfd4b1406b629dfeb2d3f4 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 19:33:04 +0800
Subject: [PATCH] 吉安航线任务推送
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 68 +++++++++++++--------------------
1 files changed, 27 insertions(+), 41 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..a18f921 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;
@@ -35,13 +36,11 @@
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.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.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.wrapper.GdPatrolTaskWrapper;
@@ -83,16 +82,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));
- // }
/**
* 巡查任务表 自定义分页
@@ -101,11 +90,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);
}
@@ -124,25 +109,6 @@
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));
- // }
/**
* 巡查任务表 删除
@@ -164,7 +130,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);
@@ -184,10 +150,10 @@
}
/**
- * 审核巡查任务
+ * 巡查任务执行完成-对外
*/
@PostMapping("/auditExternal")
- @ApiOperationSupport(order = 10)
+ @ApiOperationSupport(order = 11)
@ApiOperation(value = "巡查任务执行完成-对外", notes = "只能使用执行完成操作")
public R auditExternal(@Valid @RequestBody IdParam param) {
if (param.getId() == null) {
@@ -203,12 +169,32 @@
* 更新单个巡查任务信息
*/
@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));
+ 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);
+ }
+
+ @PostMapping("/push-xingtu")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "推送星图任务", notes = "传入巡查任务id")
+ public R pushXingtuTask(@RequestParam Long id) {
+ if (id == null) {
+ return R.fail("巡查任务id不能为空");
+ }
+ return gdPatrolTaskService.pushXingtuFlyTask(id);
+ }
}
--
Gitblit v1.9.3