Merge remote-tracking branch 'origin/master'

xiebin

2026-01-22 c680e9ae370e75fbf90d54192d0f6cf2e8fc619a

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

@@ -16,33 +16,43 @@
 */
package org.sxkj.gd.workorder.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.OrderNumUtils;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.mapper.GdPatrolTaskMapper;
import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.param.GdPatrolTaskPageParam;
import org.sxkj.gd.workorder.service.IGdPatrolTaskService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
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.vo.GdPatrolTaskVO;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
import org.sxkj.system.feign.ISysClient;
import org.sxkj.system.feign.IUserClient;

import java.io.File;
import java.util.Date;
import java.util.List;

@@ -60,7 +70,12 @@

    // @Autowired
    // private IGdWorkOrderService gdWorkOrderService;

   @Autowired
   private ISysClient sysClient;
   @Autowired
   private IUserClient userClient;
   @Autowired
   private IGdTaskResultService gdTaskResultService;
    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
        return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
@@ -103,7 +118,7 @@
            gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
            gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
            gdWorkOrderFlowEntity.setFlowName("任务发布");
            gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
            gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
            gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
            gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
            gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
@@ -141,7 +156,7 @@
        if (currentStatus == null || !currentStatus.isAllowedTransition(auditStatus)) {
            throw new RuntimeException("当前任务状态无法进行该操作");
        }
        // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝、8.执行完成
        // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
        // 3. 确定新状态和流转名称
        PatrolTaskStatusEnum newStatusEnum;
        switch (auditStatus) {
@@ -166,9 +181,6 @@
            case 7: // 验收拒绝
                newStatusEnum = PatrolTaskStatusEnum.REJECTED_ACCEPTANCE;
            break;
         case 8: // 执行完成
            newStatusEnum = PatrolTaskStatusEnum.PENDING_ACCEPTANCE;
                break;
            default: // 无效操作类型
                return false;
        }
@@ -178,6 +190,7 @@
        task.setTaskStatus(newStatusEnum.getValue());
        task.setUpdateUser(AuthUtil.getUserId());
        task.setUpdateTime(now);
      task.setRejectReason(auditParam.getRejectReason());
        boolean updateResult = updateById(task);
        if (!updateResult) {
            throw new RuntimeException("更新任务状态失败");
@@ -192,77 +205,32 @@
                    .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

            // 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksAudited(subTasks);
            // 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
            boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.AUDIT_PASSED);
            // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
            if (allSubTasksAudited) {
                // 执行工单状态更新逻辑
                // 注意：需要注入工单相关的Service才能执行更新
                GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity();
                gdWorkOrderEntity.setId(task.getWorkOrderId());
                gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
                Integer b1 = baseMapper.updateWorkOrderById(gdWorkOrderEntity);
                if (b1 > 0) {
                    // 6. 保存流转记录：使用枚举设置flowName
                    GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
                    flowEntity.setCreateUser(AuthUtil.getUserId());
                    flowEntity.setWorkOrderId(task.getWorkOrderId());
                    flowEntity.setFlowName(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getDesc());
                    flowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getDesc());
                    flowEntity.setOperator(AuthUtil.getUserName());
                    flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
                    flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
                    return gdWorkOrderFlowService.save(flowEntity);
                }
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
            }
        }
        // 7. 验收拒绝
        if (auditStatus == 7) {
            GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity();
            gdWorkOrderEntity.setId(task.getWorkOrderId());
            gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
            Integer b1 = baseMapper.updateWorkOrderById(gdWorkOrderEntity);
            if (b1 > 0) {
                // 6. 保存流转记录：使用枚举设置flowName
                GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
                flowEntity.setCreateUser(AuthUtil.getUserId());
                flowEntity.setWorkOrderId(task.getWorkOrderId());
                flowEntity.setFlowName(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getDesc());
                flowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getDesc());
                flowEntity.setOperator(AuthUtil.getUserName());
                flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
                flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
                return gdWorkOrderFlowService.save(flowEntity);
            }
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
        }
        // 7. 验收通过
        if (auditStatus == 7) {
        // 8. 验收通过
        if (auditStatus == 6) {
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                    .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

            // 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksAcceptancePassed(subTasks);
            // 检查是否所有子任务都验收通过（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
            // 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
            if (allSubTasksAudited) {
                // 执行工单状态更新逻辑
                // 注意：需要注入工单相关的Service才能执行更新
                GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity();
                gdWorkOrderEntity.setId(task.getWorkOrderId());
                gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getCode());
                Integer b1 = baseMapper.updateWorkOrderById(gdWorkOrderEntity);
                if (b1 > 0) {
                    // 6. 保存流转记录：使用枚举设置flowName
                    GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
                    flowEntity.setCreateUser(AuthUtil.getUserId());
                    flowEntity.setWorkOrderId(task.getWorkOrderId());
                    flowEntity.setFlowName(WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getDesc());
                    flowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getDesc());
                    flowEntity.setOperator(AuthUtil.getUserName());
                    flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
                    flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
                    return gdWorkOrderFlowService.save(flowEntity);
                }
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
            }
        }
        return b;
@@ -270,18 +238,19 @@


    /**
     * 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
     * 检查是否所有子任务都达到指定状态（除了被撤回和验收拒绝的）
     *
     * @param subTasks 子任务列表
     * @return 是否所有子任务都审核成功
     * @param targetStatus 目标状态枚举
     * @return 是否所有子任务都达到指定状态
     */
    private boolean checkAllSubTasksAudited(List<GdPatrolTaskEntity> subTasks) {
    private boolean checkAllSubTasksStatus(List<GdPatrolTaskEntity> subTasks, PatrolTaskStatusEnum targetStatus) {
        for (GdPatrolTaskEntity subTask : subTasks) {
            String taskStatus = subTask.getTaskStatus();
            PatrolTaskStatusEnum statusEnum = PatrolTaskStatusEnum.getByValue(taskStatus);

            // 如果任务状态不是审核成功状态，且不是被撤回和验收拒绝的，则返回false
            if (!isTaskAuditSuccess(statusEnum) &&
            // 如果任务状态不是目标状态，且不是被撤回和验收拒绝的，则返回false
            if (statusEnum != targetStatus &&
                    statusEnum != PatrolTaskStatusEnum.WITHDRAWN &&
                    statusEnum != PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
                return false;
@@ -291,54 +260,43 @@
    }

    /**
     * 判断单个任务是否审核成功
     * 更新工单状态并保存流转记录
     *
     * @param statusEnum 任务状态枚举
     * @return 是否审核成功
     * @param workOrderId 工单ID
     * @param newStatus 新的工单状态枚举
     * @return 是否更新成功
     */
    private boolean isTaskAuditSuccess(PatrolTaskStatusEnum statusEnum) {
        // 审核成功的任务状态包括：审核通过
        return statusEnum == PatrolTaskStatusEnum.AUDIT_PASSED;
    }

    /**
     * 判断单个任务是否验收通过
     *
     * @param statusEnum 任务状态枚举
     * @return 是否验收通过
     */
    private boolean isTaskAcceptancePassed(PatrolTaskStatusEnum statusEnum) {
        // 验收通过的任务状态包括：验收通过
        return statusEnum == PatrolTaskStatusEnum.ACCEPTANCE_PASSED;
    }

    /**
     * 检查是否所有子任务都验收通过（除了被撤回和验收拒绝的）
     *
     * @param subTasks 子任务列表
     * @return 是否所有子任务都验收通过
     */
    private boolean checkAllSubTasksAcceptancePassed(List<GdPatrolTaskEntity> subTasks) {
        for (GdPatrolTaskEntity subTask : subTasks) {
            String taskStatus = subTask.getTaskStatus();
            PatrolTaskStatusEnum statusEnum = PatrolTaskStatusEnum.getByValue(taskStatus);

            // 如果任务状态不是验收通过状态，且不是被撤回和验收拒绝的，则返回false
            if (!isTaskAcceptancePassed(statusEnum) &&
                    statusEnum != PatrolTaskStatusEnum.WITHDRAWN &&
                    statusEnum != PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
                return false;
            }
    private boolean updateWorkOrderStatusAndFlow(Long workOrderId, WorkOrderStatusEnum newStatus) {
        // 1. 更新工单状态
        GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity();
        gdWorkOrderEntity.setId(workOrderId);
        gdWorkOrderEntity.setWorkOrderStatus(newStatus.getCode());
        Integer updateResult = baseMapper.updateWorkOrderById(gdWorkOrderEntity);
        if (updateResult <= 0) {
            return false;
        }
        return true;

        // 2. 保存流转记录
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getDesc());
        flowEntity.setFlowDesc(String.format("%s %s 更新了任务信息，状态转换为：%s",
            AuthUtil.getUserName(),
            DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"),
            newStatus.getDesc()));
        flowEntity.setOperator(AuthUtil.getUserName());
        flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
        flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
        return gdWorkOrderFlowService.save(flowEntity);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
   public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
        if (taskEntity == null || taskEntity.getId() == null) {
            throw new RuntimeException("任务信息或ID不能为空");
        }
      }

        // 1. 验证任务是否存在
        GdPatrolTaskEntity existingTask = getById(taskEntity.getId());
@@ -386,7 +344,7 @@
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(taskEntity.getId());
        flowEntity.setFlowName(targetStatus.getDesc());
        flowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + targetStatus.getDesc());
        flowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + targetStatus.getDesc());
        flowEntity.setOperator(AuthUtil.getUserName());
        flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
        flowEntity.setAreaCode(existingTask.getAreaCode());
@@ -394,6 +352,27 @@

        return gdWorkOrderFlowService.save(flowEntity);
    }

   @Override
   public File exportPatrolReport(Long patrolTaskId) {
      if (patrolTaskId == null) {
         throw new RuntimeException("巡查任务主键不能为空");
      }
      GdPatrolTaskEntity taskEntity = getById(patrolTaskId);
      if (taskEntity == null) {
         throw new RuntimeException("巡查任务不存在");
      }
      List<GdTaskResultEntity> resultList = gdTaskResultService.list(Wrappers.<GdTaskResultEntity>lambdaQuery()
         .eq(GdTaskResultEntity::getPatrolTaskId, patrolTaskId)
         .eq(GdTaskResultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED));
      String creatorName = getUserName(taskEntity.getCreateUser());
      String deptName = getDeptName(taskEntity.getCreateDept());
      try {
         return GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
      } catch (Exception e) {
         throw new RuntimeException("生成巡查报告失败", e);
      }
   }


    /**
@@ -454,26 +433,48 @@
     * @return 流转描述
     */
    private String buildFlowDesc(PatrolTaskStatusEnum newStatus, String rejectReason) {
        String baseDesc = AuthUtil.getUserName() + " " +
                org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " ";
        String baseDesc = String.format("%s %s ",
                AuthUtil.getUserName(),
                DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        switch (newStatus) {
            case REJECTED_SIGNING:
                return baseDesc + "拒绝签收：" + rejectReason;
            case PENDING_AUDIT:
                return baseDesc + "待审核";
            case AUDIT_REJECTED:
                return baseDesc + "审核驳回：" + rejectReason;
            case AUDIT_PASSED:
                return baseDesc + "审核通过";
            case REJECTED_ACCEPTANCE:
                return baseDesc + "拒绝验收：" + rejectReason;
            case ACCEPTANCE_PASSED:
                return baseDesc + "验收通过";
            default:
                return baseDesc + newStatus.getDesc();
        // 拒绝类状态需要添加拒绝原因
        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 "/";
      }
      R<Dept> deptResult = sysClient.getDept(deptId);
      Dept dept = deptResult != null ? deptResult.getData() : null;
      if (dept == null || StringUtil.isBlank(dept.getDeptName())) {
         return "/";
      }
      return dept.getDeptName();
   }

   private String getUserName(Long userId) {
      if (userId == null) {
         return "/";
      }
      R<User> userResult = userClient.userInfoById(userId);
      User user = userResult != null ? userResult.getData() : null;
      if (user == null) {
         return "/";
      }
      String realName = user.getRealName();
      if (StringUtil.isBlank(realName)) {
         realName = user.getName();
      }
      return StringUtil.isBlank(realName) ? "/" : realName;
   }


}