update-巡检任务新增执行完成-对外

xiebin

2026-01-21 aa657596403a92faf240a8b348c8bc5ffe6c7101

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java

@@ -26,15 +26,22 @@
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.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;
@@ -43,6 +50,7 @@
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;
@@ -92,8 +100,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);
   }

@@ -149,6 +161,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()) {
@@ -166,7 +179,35 @@
   @ApiOperationSupport(order = 10)
   @ApiOperation(value = "审核巡查任务", notes = "传入审核参数，拒绝时必须填写拒绝原因")
   public R audit(@Valid @RequestBody GdPatrolTaskAuditParam auditParam) {
      boolean result = gdPatrolTaskService.auditPatrolTask(auditParam.getId(), auditParam.getAuditStatus(), auditParam.getRejectReason());
      boolean result = gdPatrolTaskService.auditPatrolTask(auditParam);
      return R.status(result);
   }

   /**
    * 审核巡查任务
    */
   @PostMapping("/auditExternal")
   @ApiOperationSupport(order = 10)
   @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 = 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);
   }