perf(task): 优化巡查任务审核性能并添加详细日志记录

linwei

2 days ago 51a551a7f8eae7654f973d45cd2fa2952774673d

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

@@ -51,11 +51,13 @@
import org.sxkj.gd.workorder.mapper.GdWorkOrderMapper;
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPendingAcceptanceQueryParam;
import org.sxkj.gd.workorder.service.IGdManageDeviceService;
import org.sxkj.gd.workorder.service.IGdPatrolTaskService;
import org.sxkj.gd.workorder.service.IGdTaskResultService;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.utils.GdPatrolReportWordUtil;
import org.sxkj.gd.workorder.utils.WorkOrderStatusAggregator;
import org.sxkj.gd.workorder.vo.GdPatrolTaskSimpleVO;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.xingtu.JianXingtuApiService;
@@ -102,7 +104,7 @@
   @Override
   public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
      List<Long> deptList = new ArrayList<>();
      if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
      if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
         deptList = SysCache.getDeptChildIds(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
      }
      gdPatrolTask.setDeptList(deptList);
@@ -199,20 +201,28 @@
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
      long startTime = System.currentTimeMillis();
      log.info("auditPatrolTask 开始执行, taskId={}, auditStatus={}", auditParam.getId(), auditParam.getAuditStatus());

      // 1. 获取巡查任务
      long stepStart = System.currentTimeMillis();
      GdPatrolTaskEntity task = getById(auditParam.getId());
      log.info("auditPatrolTask 步骤1-获取巡查任务, 耗时={}ms", System.currentTimeMillis() - stepStart);
      if (task == null) {
         throw new RuntimeException("巡查任务不存在");
      }

      // 2. 状态权限校验
      stepStart = System.currentTimeMillis();
      PatrolTaskStatusEnum currentStatus = PatrolTaskStatusEnum.getByValue(task.getTaskStatus());
      Integer auditStatus = auditParam.getAuditStatus();
      if (currentStatus == null || !currentStatus.isAllowedTransition(auditStatus)) {
         throw new RuntimeException("当前任务状态无法进行该操作");
      }
      log.info("auditPatrolTask 步骤2-状态权限校验, 耗时={}ms", System.currentTimeMillis() - stepStart);
      // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
      // 3. 确定新状态和流转名称
      stepStart = System.currentTimeMillis();
      PatrolTaskStatusEnum newStatusEnum;
      switch (auditStatus) {
         case 1: // 接单
@@ -241,6 +251,7 @@
      }

      // 4. 更新任务状态
      stepStart = System.currentTimeMillis();
      Date now = new Date();
      task.setTaskStatus(newStatusEnum.getValue());
      task.setUpdateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
@@ -250,18 +261,23 @@
      if (!updateResult) {
         throw new RuntimeException("更新任务状态失败");
      }
      log.info("auditPatrolTask 步骤4-更新任务状态, 耗时={}ms", System.currentTimeMillis() - stepStart);

      // 5. 保存流转记录
      stepStart = System.currentTimeMillis();
      boolean b = saveWorkOrderFlow(task.getId(), newStatusEnum, auditParam.getRejectReason(), task.getAreaCode());
      log.info("auditPatrolTask 步骤5-保存流转记录, 耗时={}ms", System.currentTimeMillis() - stepStart);

      // 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
      if (auditStatus == 4) {
         stepStart = System.currentTimeMillis();
         // 将审核后的任务信息推送到星图
         R pushResult = pushXingtuFlyTask(auditParam.getId());
         // 检查推送结果，如果失败则抛出异常回滚事务
         if (pushResult != null && !pushResult.isSuccess()) {
            String errorMsg = pushResult.getMsg();
            log.error("推送星图飞行任务失败: {}", errorMsg);
            throw new RuntimeException(errorMsg);
            throw new RuntimeException(errorMsg + "，请更改执行时间重新提交。");
         }
         // 查询同一个工单下的所有子任务
         List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
@@ -271,32 +287,37 @@
         boolean allSubTasksAudited = isAllSubTasksAudited(subTasks, task, PatrolTaskStatusEnum.PENDING_AUDIT);
         if (!allSubTasksAudited) {
            // 执行工单状态更新逻辑
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
            boolean result = updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
               WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
            log.info("auditPatrolTask 步骤6-同意审核-更新工单状态, 耗时={}ms", System.currentTimeMillis() - stepStart);
            return result;
         }
         log.info("auditPatrolTask 步骤6-同意审核, 耗时={}ms", System.currentTimeMillis() - stepStart);
      }
      if (auditStatus == 3) {
         // 撤回任务操作：查询同一个工单下的所有子任务
         stepStart = System.currentTimeMillis();
         // 撤回任务操作：使用状态聚合工具类计算主任务状态
         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);
         }
         // 使用状态聚合工具类计算主任务状态
         WorkOrderStatusEnum newWorkOrderStatus = WorkOrderStatusAggregator.aggregateWorkOrderStatus(subTasks);
			
         // 更新主任务状态
         updateWorkOrderStatusAndFlow(task.getWorkOrderId(), newWorkOrderStatus);
         log.info("auditPatrolTask 步骤6-撤回任务, 耗时={}ms", System.currentTimeMillis() - stepStart);
      }
      // 7. 验收拒绝
      if (auditStatus == 7) {
         return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
         stepStart = System.currentTimeMillis();
         boolean result = updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
            WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
         log.info("auditPatrolTask 步骤7-验收拒绝, 耗时={}ms", System.currentTimeMillis() - stepStart);
         return result;
      }
      // 8. 验收通过
      if (auditStatus == 6) {
         stepStart = System.currentTimeMillis();
         // 查询同一个工单下的所有子任务
         List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
            .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
@@ -308,10 +329,14 @@
            // 1.验收通过,生成报告
            asyncExportPatrolReport(task.getId());
            // 2.执行工单状态更新逻辑
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
            boolean result = updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
               WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
            log.info("auditPatrolTask 步骤8-验收通过, 耗时={}ms", System.currentTimeMillis() - stepStart);
            return result;
         }
         log.info("auditPatrolTask 步骤8-验收通过, 耗时={}ms", System.currentTimeMillis() - stepStart);
      }
      log.info("auditPatrolTask 执行完成, 总耗时={}ms", System.currentTimeMillis() - startTime);
      return b;
   }

@@ -746,7 +771,7 @@
      // 1. 更新当前任务状态
      boolean updateResult = updateById(auditParam);
      if (!updateResult) {
         log.warn("更新任务失败，任务ID: {}");
         log.warn("更新任务失败，任务ID: {}", auditParam.getId());
         return false;
      }

@@ -754,8 +779,11 @@
      GdPatrolTaskEntity patrolTaskEntity = Optional.ofNullable(getById(auditParam.getId()))
         .orElseThrow(() -> new RuntimeException("任务不存在，任务ID: " + auditParam.getId()));

      // 3. 保存巡查工单流转
      saveWorkOrderFlow(patrolTaskEntity.getWorkOrderId(), PatrolTaskStatusEnum.PENDING_ACCEPTANCE, null, null);
      // 3. 保存巡查工单流转（使用传入的实际状态）
      PatrolTaskStatusEnum statusEnum = PatrolTaskStatusEnum.getByValue(auditParam.getTaskStatus());
      if (statusEnum != null) {
         saveWorkOrderFlow(patrolTaskEntity.getId(), statusEnum, null, patrolTaskEntity.getAreaCode());
      }

      // 4. 查询同一个工单下的所有子任务
      List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
@@ -790,6 +818,26 @@
   }

   /**
    * 查询待验收状态的巡查任务列表（对外接口）
    *
    * @param queryParam 查询参数，包含任务名称和时间区间
    * @return 待验收状态的巡查任务列表
    */
   @Override
   public List<GdPatrolTaskVO> selectPendingAcceptanceTasks(GdPatrolTaskPendingAcceptanceQueryParam queryParam) {
      // 1. 参数校验：防止空指针
      if (queryParam == null) {
         queryParam = new GdPatrolTaskPendingAcceptanceQueryParam();
      }

      // 2. 调用Mapper查询待验收状态的巡查任务
      List<GdPatrolTaskVO> pendingAcceptanceTasks = baseMapper.selectPendingAcceptanceTasks(queryParam);

      // 3. 返回查询结果
      return pendingAcceptanceTasks;
   }

   /**
    * 将区域编码转换为多级行政区划编码格式
    *
    * @param areaCode 区域编码（如：360802）