From 939a99e2b94ca9dc96cf88b1ec403fc357f50e8a Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 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 e43c9ab..e96bc13 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
@@ -26,12 +26,20 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
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.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
+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;
@@ -40,9 +48,13 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
+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 javax.servlet.http.HttpServletResponse;
/**
@@ -72,13 +84,13 @@
/**
* 巡查任务表 分页
*/
- @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));
- }
+ // @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));
+ // }
/**
* 巡查任务表 自定义分页
@@ -86,8 +98,12 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdPatrolTask")
- public R<IPage<GdPatrolTaskVO>> page(GdPatrolTaskVO gdPatrolTask, Query query) {
- IPage<GdPatrolTaskVO> pages = gdPatrolTaskService.selectGdPatrolTaskPage(Condition.getPage(query), 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()))
+ );
return R.data(pages);
}
@@ -97,29 +113,34 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdPatrolTask")
- public R save(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
- return R.status(gdPatrolTaskService.save(gdPatrolTask));
+ public R save(@Valid @RequestBody List<GdPatrolTaskAddParam> gdPatrolTaskList) {
+ List<GdPatrolTaskEntity> taskEntityList = new ArrayList<>();
+ gdPatrolTaskList.forEach(gdPatrolTask -> {
+ GdPatrolTaskEntity gdPatrolTaskEntity = Objects.requireNonNull(BeanUtil.copy(gdPatrolTask, GdPatrolTaskEntity.class));
+ taskEntityList.add(gdPatrolTaskEntity);
+ });
+ 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("/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));
- }
+ // @PostMapping("/submit")
+ // @ApiOperationSupport(order = 6)
+ // @ApiOperation(value = "新增或修改", notes = "传入gdPatrolTask")
+ // public R submit(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
+ // return R.status(gdPatrolTaskService.saveOrUpdate(gdPatrolTask));
+ // }
/**
* 巡查任务表 删除
@@ -138,6 +159,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()) {
@@ -148,4 +170,41 @@
ExcelUtil.export(response, "巡查任务表数据" + DateUtil.time(), "巡查任务表数据表", list, GdPatrolTaskExcel.class);
}
+ /**
+ * 审核巡查任务
+ */
+ @PostMapping("/audit")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "审核巡查任务", notes = "传入审核参数，拒绝时必须填写拒绝原因")
+ public R audit(@Valid @RequestBody GdPatrolTaskAuditParam auditParam) {
+ boolean result = gdPatrolTaskService.auditPatrolTask(auditParam);
+ return R.status(result);
+ }
+
+ /**
+ * 审核巡查任务
+ */
+ @PostMapping("/auditExternal")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "巡查任务执行完成-对外", notes = "只能使用执行完成操作")
+ public R auditExternal(@Valid @RequestBody GdPatrolTaskAuditParam auditParam) {
+ if (auditParam.getAuditStatus() != 8) {
+ return R.fail("非法参数");
+ }
+ boolean result = gdPatrolTaskService.auditPatrolTask(auditParam);
+ return R.status(result);
+ }
+
+ /**
+ * 更新单个巡查任务信息
+ */
+ @PostMapping("/republish")
+ @ApiOperationSupport(order = 11)
+ @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);
+ }
+
}
--
Gitblit v1.9.3