Merge remote-tracking branch 'origin/master'

zhongrj

2026-01-31 d9644b47ac04cd20c79ae6583f9a82b5f7535170

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -67,6 +67,8 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * 巡查任务表 服务实现类
@@ -94,11 +96,13 @@
   private JianXingtuApiService jianXingtuApiService;
   @Autowired
   private IGdManageDeviceService gdManageDeviceService;

    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      gdPatrolTask.setDeptList(deptList);
        return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
      List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
      return page.setRecords(gdPatrolTaskVOS);
    }


@@ -138,8 +142,8 @@
            gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
            gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
            gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
            gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
            gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
         gdWorkOrderFlowEntity.setFlowDesc(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
         gdWorkOrderFlowEntity.setOperator(AuthUtil.getNickName());
            gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
            gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
            gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -235,6 +239,21 @@
                    WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
            }
        }
      if (auditStatus == 3) {
         // 查询同一个工单下的所有子任务
         List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
            .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

         boolean allSubTasksWithdrawn = subTasks.stream()
            .allMatch(item -> item.getTaskStatus().equals(PatrolTaskStatusEnum.WITHDRAWN.getValue()));

         // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
         if (allSubTasksWithdrawn) {
            // 执行工单状态更新逻辑
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
               WorkOrderStatusEnum.RESPONDING_CANCELED);
         }
      }
        // 7. 验收拒绝
        if (auditStatus == 7) {
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
@@ -305,12 +324,11 @@
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());
        flowEntity.setFlowDesc(String.format("%s %s 更新了任务信息，状态转换为：%s",
            AuthUtil.getUserName(),
            DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
            newStatus.getStageDesc()));
        flowEntity.setOperator(AuthUtil.getUserName());
      flowEntity.setFlowDesc(newStatus.getDesc());
      flowEntity.setOperator(AuthUtil.getNickName());
        flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
      flowEntity.setFlowStatus(newStatus.getMaxCode());
      flowEntity.setWorkStatus(newStatus.getCode());
        flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
        return gdWorkOrderFlowService.save(flowEntity);
    }
@@ -368,8 +386,8 @@
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(taskEntity.getId());
        flowEntity.setFlowName(targetStatus.getDesc());
        flowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + targetStatus.getDesc());
        flowEntity.setOperator(AuthUtil.getUserName());
      flowEntity.setFlowDesc(AuthUtil.getNickName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + targetStatus.getDesc());
      flowEntity.setOperator(AuthUtil.getNickName());
        flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
        flowEntity.setAreaCode(existingTask.getAreaCode());
        flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -447,12 +465,8 @@
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());

        // 构建流转描述
        String flowDesc = buildFlowDesc(newStatus, rejectReason);
        flowEntity.setFlowDesc(flowDesc);

        flowEntity.setOperator(AuthUtil.getUserName());
      flowEntity.setFlowDesc(newStatus.getStageDesc());
      flowEntity.setOperator(AuthUtil.getNickName());
        flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
        flowEntity.setAreaCode(areaCode);
        flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
@@ -464,29 +478,14 @@
        return true;
    }



    /**
     * 构建流转描述
    * 根据部门ID获取部门名称
     *
     * @param newStatus    新状态
     * @param rejectReason 拒绝原因
     * @return 流转描述
    * @param deptId 部门ID
    * @return 部门名称，缺失时返回"/"
     */
    private String buildFlowDesc(PatrolTaskStatusEnum newStatus, String rejectReason) {
        String baseDesc = String.format("%s %s ",
                AuthUtil.getUserName(),
                DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        // 拒绝类状态需要添加拒绝原因
        if (newStatus == PatrolTaskStatusEnum.REJECTED_SIGNING ||
            newStatus == PatrolTaskStatusEnum.AUDIT_REJECTED ||
            newStatus == PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
            return String.format("%s%s：%s", baseDesc, newStatus.getDesc(), rejectReason);
        }

        // 其他状态直接使用枚举描述
        return baseDesc + newStatus.getDesc();
    }

   private String getDeptName(Long deptId) {
      if (deptId == null) {
         return "/";
@@ -499,6 +498,12 @@
      return dept.getDeptName();
   }

   /**
    * 根据用户ID获取用户姓名
    *
    * @param userId 用户ID
    * @return 用户姓名，缺失时返回"/"
    */
   private String getUserName(Long userId) {
      if (userId == null) {
         return "/";
@@ -515,6 +520,13 @@
      return StringUtil.isBlank(realName) ? "/" : realName;
   }

   /**
    * 上传巡查报告并保存附件信息
    *
    * @param reportFile 报告文件
    * @param taskEntity 巡查任务
    * @return 是否保存成功
    */
   private boolean saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
      if (reportFile == null || !reportFile.exists()) {
         throw new RuntimeException("巡查报告文件不存在");
@@ -538,6 +550,16 @@
      return true;
   }

   /**
    * 构建附件元数据
    *
    * @param taskEntity  巡查任务
    * @param reportFile  报告文件
    * @param bladeFile   文件上传结果
    * @param resultType  结果类型
    * @param desiredName 期望文件名
    * @return 附件信息
    */
   private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType, String desiredName) {
      Attach attach = new Attach();
      attach.setDomainUrl(bladeFile.getDomain());
@@ -569,6 +591,13 @@
      return attach;
   }

   /**
    * 生成报告附件名称
    *
    * @param taskEntity   巡查任务
    * @param fallbackName 兜底文件名
    * @return 附件名称
    */
   private String buildReportAttachName(GdPatrolTaskEntity taskEntity, String fallbackName) {
      String taskNo = taskEntity != null ? taskEntity.getTaskNo() : null;
      if (StringUtil.isBlank(taskNo)) {
@@ -577,6 +606,12 @@
      return taskNo + ".docx";
   }

   /**
    * 解析巡查任务类型为结果类型
    *
    * @param patrolTaskType 巡查任务类型
    * @return 结果类型
    */
   private Integer parseResultType(String patrolTaskType) {
      if (StringUtil.isBlank(patrolTaskType)) {
         return null;
@@ -607,6 +642,7 @@

   /**
    * 构建巡察任务推送的巡察任务信息
    *
    * @param gdPatrolTaskVO
    * @return
    */
@@ -650,40 +686,8 @@
         //    param.setAirportId(taskEntity.getAirportId());
         // }
      }
      String status = parseStatus(gdPatrolTaskVO.getTaskStatus());
      if (StringUtil.isNotBlank(status)) {
         param.setStatus(status);
      }
      param.setTaskType("定时执行");
      param.setStatus("待执行");
      param.setTaskType("航线飞行");
      return param;
   }

   private String parseStatus(String taskStatus) {
      if (StringUtil.isBlank(taskStatus)) {
         return null;
      }
      switch (taskStatus) {
         case "0":
            return "待签收";
         case "1":
            return "拒绝签收";
         case "2":
            return "已撤回";
         case "3":
            return "待审核";
         case "4":
            return "审核驳回";
         case "5":
            return "审核通过";
         case "6":
            return "待验收";
         case "7":
            return "拒绝验收";
         case "8":
            return "验收通过";
         default:
            return taskStatus;
      }
   }

}