工单流程优化

linwei

2026-01-31 bcc36efe5fd3264625bb884e50c2f353fb052b61

工单流程优化

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java

@@ -13,13 +13,12 @@
 * @date 2026-01-19
 */
@Getter
@AllArgsConstructor
public enum PatrolTaskStatusEnum {

    /**
     * 待签收
     */
    PENDING_SIGNING("0", "待签收","待签收"),
    PENDING_SIGNING("0", "待签收","巡检任务拆分"),

    /**
     * 拒绝签收
@@ -34,7 +33,7 @@
    /**
     * 待审核
     */
    PENDING_AUDIT("3", "待审核","待审核"),
    PENDING_AUDIT("3", "待审核","待签收"),

    /**
     * 审核驳回
@@ -79,6 +78,18 @@
    @JsonValue
    private final String stageDesc;

    PatrolTaskStatusEnum(String stageDesc) {
        this.value = "";
        this.desc = "";
        this.stageDesc = stageDesc;
    }

    PatrolTaskStatusEnum(String value, String desc, String stageDesc) {
        this.value = value;
        this.desc = desc;
        this.stageDesc = stageDesc;
    }

    /**
     * 根据值获取对应的枚举
     *

 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,287 +96,304 @@
    private JianXingtuApiService jianXingtuApiService;
    @Autowired
    private IGdManageDeviceService gdManageDeviceService;
    @Override
    public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {

    @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);
    }


    @Override
    public List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper) {
        List<GdPatrolTaskExcel> gdPatrolTaskList = baseMapper.exportGdPatrolTask(queryWrapper);
        // gdPatrolTaskList.forEach(gdPatrolTask -> {
        //    gdPatrolTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdPatrolTask.getType()));
        //});
        return gdPatrolTaskList;
    }
    @Override
    public List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper) {
        List<GdPatrolTaskExcel> gdPatrolTaskList = baseMapper.exportGdPatrolTask(queryWrapper);
        // gdPatrolTaskList.forEach(gdPatrolTask -> {
        //    gdPatrolTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdPatrolTask.getType()));
        //});
        return gdPatrolTaskList;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
        // 更新流程节点
        for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
            // 生成巡查任务编号
            if (StringUtils.isBlank(gdPatrolTaskEntity.getTaskNo())) {
                // 使用时间戳生成唯一巡查任务编号
                String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.PATROL_TASK_KEY);
                gdPatrolTaskEntity.setTaskNo(WordOrderConstant.PATROL_TASK_PREFIX + timestamp);
            }
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
        // 更新流程节点
        for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
            // 生成巡查任务编号
            if (StringUtils.isBlank(gdPatrolTaskEntity.getTaskNo())) {
                // 使用时间戳生成唯一巡查任务编号
                String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.PATROL_TASK_KEY);
                gdPatrolTaskEntity.setTaskNo(WordOrderConstant.PATROL_TASK_PREFIX + timestamp);
            }

            // 设置初始状态为待签收（对应流程图：等待接单）
            gdPatrolTaskEntity.setTaskStatus(PatrolTaskStatusEnum.PENDING_SIGNING.getValue());
            // 设置初始状态为待签收（对应流程图：等待接单）
            gdPatrolTaskEntity.setTaskStatus(PatrolTaskStatusEnum.PENDING_SIGNING.getValue());

            // 保存巡逻任务
            boolean save = save(gdPatrolTaskEntity);
            if (!save) {
                // 任务保存失败，抛出异常触发回滚
                throw new RuntimeException("保存巡逻任务失败：" + gdPatrolTaskEntity.toString());
            }
            // 保存巡逻任务
            boolean save = save(gdPatrolTaskEntity);
            if (!save) {
                // 任务保存失败，抛出异常触发回滚
                throw new RuntimeException("保存巡逻任务失败：" + gdPatrolTaskEntity.toString());
            }

            // 保存流转记录（发布任务，等待接单）
            GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
            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.getNickName());
            gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
            gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
            gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
            boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
            if (!save1) {
                // 流转记录保存失败，抛出异常触发回滚
                throw new RuntimeException("保存流转记录失败：" + gdWorkOrderFlowEntity.toString());
            }
        }

        // 所有任务和流转记录都保存成功
        return true;
    }

    /**
     * 审核巡查任务
     *
     * @param auditParam 审核参数，包含任务ID、审核状态和拒绝原因
     * @return 是否审核成功
     * @throws RuntimeException 当任务不存在、状态不允许转换或操作失败时抛出
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
        // 1. 获取巡查任务
        GdPatrolTaskEntity task = getById(auditParam.getId());
        if (task == null) {
            throw new RuntimeException("巡查任务不存在");
        }

        // 2. 状态权限校验
        PatrolTaskStatusEnum currentStatus = PatrolTaskStatusEnum.getByValue(task.getTaskStatus());
        Integer auditStatus = auditParam.getAuditStatus();
        if (currentStatus == null || !currentStatus.isAllowedTransition(auditStatus)) {
            throw new RuntimeException("当前任务状态无法进行该操作");
        }
        // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
        // 3. 确定新状态和流转名称
        PatrolTaskStatusEnum newStatusEnum;
        switch (auditStatus) {
            case 1: // 接单
                newStatusEnum = PatrolTaskStatusEnum.PENDING_AUDIT;
                break;
            case 2: // 拒接接单
                newStatusEnum = PatrolTaskStatusEnum.REJECTED_SIGNING;
                break;
            case 3: // 撤回任务
                newStatusEnum = PatrolTaskStatusEnum.WITHDRAWN;
                break;
            case 4: // 同意审核
                newStatusEnum = PatrolTaskStatusEnum.AUDIT_PASSED;
                break;
            case 5: // 拒绝审核
                newStatusEnum = PatrolTaskStatusEnum.AUDIT_REJECTED;
                break;
            case 6: // 验收通过
                newStatusEnum = PatrolTaskStatusEnum.ACCEPTANCE_PASSED;
                break;
            case 7: // 验收拒绝
                newStatusEnum = PatrolTaskStatusEnum.REJECTED_ACCEPTANCE;
                break;
            default: // 无效操作类型
                return false;
        }

        // 4. 更新任务状态
        Date now = new Date();
        task.setTaskStatus(newStatusEnum.getValue());
        task.setUpdateUser(AuthUtil.getUserId());
        task.setUpdateTime(now);
        task.setRejectReason(auditParam.getRejectReason());
        boolean updateResult = updateById(task);
        if (!updateResult) {
            throw new RuntimeException("更新任务状态失败");
        }

        // 5. 保存流转记录
        boolean b = saveWorkOrderFlow(task.getId(), newStatusEnum, auditParam.getRejectReason(), task.getAreaCode());
        // 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
        if (auditStatus == 4) {
            //将审核后的任务信息推送到星图
            pushXingtuFlyTask(auditParam.getId());
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                    .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

            // 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.AUDIT_PASSED);
            // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
            if (allSubTasksAudited) {
                // 执行工单状态更新逻辑
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
            }
        }
        // 7. 验收拒绝
        if (auditStatus == 7) {
            return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
        }
        // 8. 验收通过
        if (auditStatus == 6) {
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                    .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

            // 检查是否所有子任务都验收通过（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
            // 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
            if (allSubTasksAudited) {
                // 1.验收通过,生成报告
                asyncExportPatrolReport(task.getId());
                // 2.执行工单状态更新逻辑
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
            }
        }
        return b;
    }


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

            // 如果任务状态不是目标状态，且不是被撤回和验收拒绝的，则返回false
            if (statusEnum != targetStatus &&
                    statusEnum != PatrolTaskStatusEnum.WITHDRAWN &&
                    statusEnum != PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
                return false;
            }
        }
        return true;
    }

    /**
     * 更新工单状态并保存流转记录
     *
     * @param workOrderId 工单ID
     * @param newStatus 新的工单状态枚举
     * @return 是否更新成功
     */
    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;
        }

        // 2. 保存流转记录
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());
        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);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
        if (taskEntity == null || taskEntity.getId() == null) {
            throw new RuntimeException("任务信息或ID不能为空");
            // 保存流转记录（发布任务，等待接单）
            GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
            gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
            gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
            gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
            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()));
            boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
            if (!save1) {
                // 流转记录保存失败，抛出异常触发回滚
                throw new RuntimeException("保存流转记录失败：" + gdWorkOrderFlowEntity.toString());
            }
        }

        // 1. 验证任务是否存在
        GdPatrolTaskEntity existingTask = getById(taskEntity.getId());
        taskEntity.setId(existingTask.getId());
        if (existingTask == null) {
            throw new RuntimeException("巡查任务不存在");
        }
        // 所有任务和流转记录都保存成功
        return true;
    }

        // 2. 先确定枚举状态：根据当前状态确定新的枚举状态
        PatrolTaskStatusEnum targetStatus;
        String currentStatus = existingTask.getTaskStatus();
        // 1.发布中_拒绝接单 、 4.响应中_审核驳回
        switch (currentStatus) {
            case "1": // 发布中_拒绝接单 → 发布中_接单中
                targetStatus = PatrolTaskStatusEnum.PENDING_SIGNING;
                break;
            case "4": // 响应中_审核驳回 → 响应中_待审核
                targetStatus = PatrolTaskStatusEnum.PENDING_AUDIT;
                break;
            default:
                // 其他状态，保持原有状态
                targetStatus = PatrolTaskStatusEnum.getByValue(currentStatus);
                // 如果无法获取枚举，使用待签收作为默认状态
                if (targetStatus == null) {
                    targetStatus = PatrolTaskStatusEnum.PENDING_SIGNING;
                }
                break;
        }
    /**
     * 审核巡查任务
     *
     * @param auditParam 审核参数，包含任务ID、审核状态和拒绝原因
     * @return 是否审核成功
     * @throws RuntimeException 当任务不存在、状态不允许转换或操作失败时抛出
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean auditPatrolTask(GdPatrolTaskAuditParam auditParam) {
        // 1. 获取巡查任务
        GdPatrolTaskEntity task = getById(auditParam.getId());
        if (task == null) {
            throw new RuntimeException("巡查任务不存在");
        }

        // 3. 设置任务状态：使用枚举设置任务状态
        taskEntity.setTaskStatus(targetStatus.getValue());
        // 2. 状态权限校验
        PatrolTaskStatusEnum currentStatus = PatrolTaskStatusEnum.getByValue(task.getTaskStatus());
        Integer auditStatus = auditParam.getAuditStatus();
        if (currentStatus == null || !currentStatus.isAllowedTransition(auditStatus)) {
            throw new RuntimeException("当前任务状态无法进行该操作");
        }
        // 1.同意签收、2.拒绝签收 、3.撤回任务 、4.同意审核、 5.拒绝审核、 6.验收通过、 7.验收拒绝
        // 3. 确定新状态和流转名称
        PatrolTaskStatusEnum newStatusEnum;
        switch (auditStatus) {
            case 1: // 接单
                newStatusEnum = PatrolTaskStatusEnum.PENDING_AUDIT;
                break;
            case 2: // 拒接接单
                newStatusEnum = PatrolTaskStatusEnum.REJECTED_SIGNING;
                break;
            case 3: // 撤回任务
                newStatusEnum = PatrolTaskStatusEnum.WITHDRAWN;
                break;
            case 4: // 同意审核
                newStatusEnum = PatrolTaskStatusEnum.AUDIT_PASSED;
                break;
            case 5: // 拒绝审核
                newStatusEnum = PatrolTaskStatusEnum.AUDIT_REJECTED;
                break;
            case 6: // 验收通过
                newStatusEnum = PatrolTaskStatusEnum.ACCEPTANCE_PASSED;
                break;
            case 7: // 验收拒绝
                newStatusEnum = PatrolTaskStatusEnum.REJECTED_ACCEPTANCE;
                break;
            default: // 无效操作类型
                return false;
        }

        // 4. 更新任务信息：合并传入的任务信息
        taskEntity.setUpdateUser(AuthUtil.getUserId());
        taskEntity.setUpdateTime(new Date());
        // 4. 更新任务状态
        Date now = new Date();
        task.setTaskStatus(newStatusEnum.getValue());
        task.setUpdateUser(AuthUtil.getUserId());
        task.setUpdateTime(now);
        task.setRejectReason(auditParam.getRejectReason());
        boolean updateResult = updateById(task);
        if (!updateResult) {
            throw new RuntimeException("更新任务状态失败");
        }

        // 5. 更新数据库
        boolean updateResult = updateById(taskEntity);
        if (!updateResult) {
            throw new RuntimeException("更新任务信息失败");
        }
        // 5. 保存流转记录
        boolean b = saveWorkOrderFlow(task.getId(), newStatusEnum, auditParam.getRejectReason(), task.getAreaCode());
        // 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
        if (auditStatus == 4) {
            // 将审核后的任务信息推送到星图
            pushXingtuFlyTask(auditParam.getId());
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

        // 6. 保存流转记录：使用枚举设置flowName
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(taskEntity.getId());
        flowEntity.setFlowName(targetStatus.getDesc());
        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()));
            // 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.AUDIT_PASSED);
            // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
            if (allSubTasksAudited) {
                // 执行工单状态更新逻辑
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
            }
        }
        if (auditStatus == 3) {
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

        return gdWorkOrderFlowService.save(flowEntity);
    }
            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(),
                WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED);
        }
        // 8. 验收通过
        if (auditStatus == 6) {
            // 查询同一个工单下的所有子任务
            List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
                .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));

            // 检查是否所有子任务都验收通过（除了被撤回和验收拒绝的）
            boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
            // 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
            if (allSubTasksAudited) {
                // 1.验收通过,生成报告
                asyncExportPatrolReport(task.getId());
                // 2.执行工单状态更新逻辑
                return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
                    WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
            }
        }
        return b;
    }


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

            // 如果任务状态不是目标状态，且不是被撤回和验收拒绝的，则返回false
            if (statusEnum != targetStatus &&
                statusEnum != PatrolTaskStatusEnum.WITHDRAWN &&
                statusEnum != PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
                return false;
            }
        }
        return true;
    }

    /**
     * 更新工单状态并保存流转记录
     *
     * @param workOrderId 工单ID
     * @param newStatus   新的工单状态枚举
     * @return 是否更新成功
     */
    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;
        }

        // 2. 保存流转记录
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());
        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);
    }

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

        // 1. 验证任务是否存在
        GdPatrolTaskEntity existingTask = getById(taskEntity.getId());
        taskEntity.setId(existingTask.getId());
        if (existingTask == null) {
            throw new RuntimeException("巡查任务不存在");
        }

        // 2. 先确定枚举状态：根据当前状态确定新的枚举状态
        PatrolTaskStatusEnum targetStatus;
        String currentStatus = existingTask.getTaskStatus();
        // 1.发布中_拒绝接单 、 4.响应中_审核驳回
        switch (currentStatus) {
            case "1": // 发布中_拒绝接单 → 发布中_接单中
                targetStatus = PatrolTaskStatusEnum.PENDING_SIGNING;
                break;
            case "4": // 响应中_审核驳回 → 响应中_待审核
                targetStatus = PatrolTaskStatusEnum.PENDING_AUDIT;
                break;
            default:
                // 其他状态，保持原有状态
                targetStatus = PatrolTaskStatusEnum.getByValue(currentStatus);
                // 如果无法获取枚举，使用待签收作为默认状态
                if (targetStatus == null) {
                    targetStatus = PatrolTaskStatusEnum.PENDING_SIGNING;
                }
                break;
        }

        // 3. 设置任务状态：使用枚举设置任务状态
        taskEntity.setTaskStatus(targetStatus.getValue());

        // 4. 更新任务信息：合并传入的任务信息
        taskEntity.setUpdateUser(AuthUtil.getUserId());
        taskEntity.setUpdateTime(new Date());

        // 5. 更新数据库
        boolean updateResult = updateById(taskEntity);
        if (!updateResult) {
            throw new RuntimeException("更新任务信息失败");
        }

        // 6. 保存流转记录：使用枚举设置flowName
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(taskEntity.getId());
        flowEntity.setFlowName(targetStatus.getDesc());
        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()));

        return gdWorkOrderFlowService.save(flowEntity);
    }

    @Override
    public boolean exportPatrolReport(Long patrolTaskId) {
@@ -413,78 +432,53 @@
        }
    }

    /**
     * 检查拒绝原因是否必填
     *
     * @param newStatus     新状态
     * @param rejectReason  拒绝原因
     * @throws RuntimeException 当需要拒绝原因但未提供时抛出
     */
    // private void checkRejectReason(PatrolTaskStatusEnum newStatus, String rejectReason) {
    //     // 拒绝类状态需要填写拒绝原因
    //     if ((newStatus == PatrolTaskStatusEnum.REJECTED_SIGNING ||
    //          newStatus == PatrolTaskStatusEnum.AUDIT_REJECTED ||
    //          newStatus == PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) &&
    //         (rejectReason == null || rejectReason.trim().isEmpty())) {
    //         throw new RuntimeException("拒绝操作时必须填写拒绝原因");
    //     }
    // }
    /**
     * 检查拒绝原因是否必填
     *
     * @param newStatus     新状态
     * @param rejectReason  拒绝原因
     * @throws RuntimeException 当需要拒绝原因但未提供时抛出
     */
    // private void checkRejectReason(PatrolTaskStatusEnum newStatus, String rejectReason) {
    //     // 拒绝类状态需要填写拒绝原因
    //     if ((newStatus == PatrolTaskStatusEnum.REJECTED_SIGNING ||
    //          newStatus == PatrolTaskStatusEnum.AUDIT_REJECTED ||
    //          newStatus == PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) &&
    //         (rejectReason == null || rejectReason.trim().isEmpty())) {
    //         throw new RuntimeException("拒绝操作时必须填写拒绝原因");
    //     }
    // }

    /**
     * 保存工单流转记录
     *
     * @param workOrderId  工单ID
     * @param newStatus    新状态
     * @param rejectReason 拒绝原因
     * @param areaCode     区域编码
     * @return 是否保存成功
     * @throws RuntimeException 当保存失败时抛出
     */
    private boolean saveWorkOrderFlow(Long workOrderId, PatrolTaskStatusEnum newStatus,
                                      String rejectReason, String areaCode) {
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());
    /**
     * 保存工单流转记录
     *
     * @param workOrderId  工单ID
     * @param newStatus    新状态
     * @param rejectReason 拒绝原因
     * @param areaCode     区域编码
     * @return 是否保存成功
     * @throws RuntimeException 当保存失败时抛出
     */
    private boolean saveWorkOrderFlow(Long workOrderId, PatrolTaskStatusEnum newStatus,
                                      String rejectReason, String areaCode) {
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getStageDesc());
        flowEntity.setFlowDesc(newStatus.getStageDesc());
        flowEntity.setOperator(AuthUtil.getNickName());
        flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
        flowEntity.setAreaCode(areaCode);
        flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));

        // 构建流转描述
        String flowDesc = buildFlowDesc(newStatus, rejectReason);
        flowEntity.setFlowDesc(flowDesc);
        boolean saveResult = gdWorkOrderFlowService.save(flowEntity);
        if (!saveResult) {
            throw new RuntimeException("保存流转记录失败");
        }
        return true;
    }

        flowEntity.setOperator(AuthUtil.getNickName());
        flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
        flowEntity.setAreaCode(areaCode);
        flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));

        boolean saveResult = gdWorkOrderFlowService.save(flowEntity);
        if (!saveResult) {
            throw new RuntimeException("保存流转记录失败");
        }
        return true;
    }

    /**
     * 构建流转描述
     *
     * @param newStatus    新状态
     * @param rejectReason 拒绝原因
     * @return 流转描述
     */
    private String buildFlowDesc(PatrolTaskStatusEnum newStatus, String rejectReason) {
        String baseDesc = String.format("%s %s ",
                AuthUtil.getNickName(),
                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) {
@@ -606,6 +600,7 @@

    /**
     * 构建巡察任务推送的巡察任务信息
     *
     * @param gdPatrolTaskVO
     * @return
     */
@@ -619,7 +614,7 @@
        if (StringUtil.isNotBlank(gdPatrolTaskVO.getPatrolTaskType())) {
            param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
        }
        if ((gdPatrolTaskVO.getId()!=null)) {
        if ((gdPatrolTaskVO.getId() != null)) {
            param.setPatrolTaskld(String.valueOf(gdPatrolTaskVO.getId()));
        }
        param.setTimingType("单次执行");

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

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

import lombok.extern.slf4j.Slf4j;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.vo.GdWorkOrderFlowVO;
import org.sxkj.gd.workorder.vo.WorkOrderStageVO;
@@ -38,6 +39,7 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@Service
public class GdWorkOrderFlowServiceImpl extends BaseServiceImpl<GdWorkOrderFlowMapper, GdWorkOrderFlowEntity> implements IGdWorkOrderFlowService {

@@ -74,12 +76,20 @@
    private List<WorkOrderStageVO> buildHierarchicalFlow(List<GdWorkOrderFlowEntity> actualFlows) {
        List<WorkOrderStageVO> stages = new ArrayList<>();

        // 确定当前阶段代码
        String currentStageCode = "0"; // 默认未开始
        if (actualFlows != null && !actualFlows.isEmpty()) {
            // 获取最后一个流程的状态作为当前阶段
            GdWorkOrderFlowEntity lastFlow = actualFlows.get(actualFlows.size() - 1);
            currentStageCode = lastFlow.getFlowStatus();
        }

        // 3. 遍历所有工单阶段
        // 工单发布阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.PUBLISHING_ACCEPTING.getStageDesc(),
                WorkOrderStatusEnum.PUBLISHING_REJECTING.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_WORK_ORDER_RELEASE.getMaxCode(), currentStageCode));

        // 接单响应阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getStageDesc(), Arrays.asList(
@@ -87,28 +97,28 @@
                WorkOrderStatusEnum.RESPONDING_APPLY_CANCEL.getStageDesc(),
                WorkOrderStatusEnum.RESPONDING_APPLY_MODIFY.getStageDesc(),
                WorkOrderStatusEnum.RESPONDING_CANCELED.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_ORDER_RESPONSE.getMaxCode(), currentStageCode));

        // 执行中阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_IN_EXECUTION.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getStageDesc(),
                WorkOrderStatusEnum.EXECUTING_NEGOTIATE_MODIFY.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_IN_EXECUTION.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_IN_EXECUTION.getMaxCode(), currentStageCode));

        // 完成待验阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_COMPLETED_PENDING_INSPECTION.getMaxCode(), currentStageCode));

        // 验收通过阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_ACCEPTED.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_ACCEPTED.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_ACCEPTED.getMaxCode(), currentStageCode));

        // 结算完成阶段
        stages.add(buildStage(WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getStageDesc(), Arrays.asList(
                WorkOrderStatusEnum.SETTLEMENT_COMPLETED.getStageDesc()
        ), actualFlows, WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getMaxCode()));
        ), actualFlows, WorkOrderStatusEnum.STAGE_SETTLEMENT_COMPLETED.getMaxCode(), currentStageCode));

        return stages;
    }
@@ -120,48 +130,111 @@
     * @param statusNames   状态名称列表
     * @param actualFlows   实际流程记录
     * @param flowStatus    流程状态码
     * @param currentStageCode 当前阶段代码
     * @return 阶段流程数据
     */
    private WorkOrderStageVO buildStage(String stageName, List<String> statusNames, List<GdWorkOrderFlowEntity> actualFlows, String flowStatus) {
    private WorkOrderStageVO buildStage(String stageName, List<String> statusNames, List<GdWorkOrderFlowEntity> actualFlows, String flowStatus, String currentStageCode) {
        List<WorkOrderStatusDetailVO> statuses = new ArrayList<>();

        // 检查该阶段是否在当前阶段之后
        // 注意：即使流程回退，之前到达过的阶段仍然需要显示其记录
        // 而是让所有阶段都能显示其已到达的状态，只对未到达的状态进行处理
        // boolean isStageAfterCurrent = false;
        // try {
        //     int stageCode = Integer.parseInt(flowStatus);
        //     int currentCode = Integer.parseInt(currentStageCode);
        //     isStageAfterCurrent = stageCode > currentCode;
        // } catch (NumberFormatException e) {
        //     // 如果转换失败，默认不视为在当前阶段之后
        // }

        // 临时列表，用于收集所有状态详情
        List<WorkOrderStatusDetailVO> tempStatuses = new ArrayList<>();

        // 遍历该阶段的所有状态
        for (String statusName : statusNames) {
            // 查找是否有对应的实际流程记录
            GdWorkOrderFlowEntity matchingFlow = findMatchingFlow(actualFlows, statusName, flowStatus);
            log.info("正在处理状态：{}", statusName);
            // 查找所有对应的实际流程记录
            List<GdWorkOrderFlowEntity> matchingFlows = findMatchingFlows(actualFlows, statusName, flowStatus);

            if (matchingFlow != null) {
                // 已到达的状态
                statuses.add(new WorkOrderStatusDetailVO(
            if (!matchingFlows.isEmpty()) {
                // 对匹配的流程记录按创建时间排序
                matchingFlows.sort((f1, f2) -> {
                    if (f1.getCreateTime() != null && f2.getCreateTime() != null) {
                        return f1.getCreateTime().compareTo(f2.getCreateTime());
                    } else if (f1.getCreateTime() != null) {
                        return -1;
                    } else {
                        return 1;
                    }
                });

                // 为每个排序后的流程记录创建状态详情
                // 无论阶段是否在当前阶段之后，只要有匹配的流程记录，就标记为已到达
                for (GdWorkOrderFlowEntity matchingFlow : matchingFlows) {
                    tempStatuses.add(new WorkOrderStatusDetailVO(
                        statusName,
                        true,
                    true,
                        matchingFlow.getOperator(),
                        matchingFlow.getCreateTime()
                ));
                }
            } else {
                // 未到达的状态
                statuses.add(new WorkOrderStatusDetailVO(statusName));
                // 如果阶段在当前阶段之后，则标记为未到达
                // 如果阶段在当前阶段之前或等于，则也标记为未到达（因为没有匹配的流程记录）
                tempStatuses.add(new WorkOrderStatusDetailVO(statusName));
            }
        }

        // 分离已到达和未到达的状态
        List<WorkOrderStatusDetailVO> reachedStatuses = new ArrayList<>();
        List<WorkOrderStatusDetailVO> unreachedStatuses = new ArrayList<>();

        for (WorkOrderStatusDetailVO status : tempStatuses) {
            if (status.isReached()) {
                reachedStatuses.add(status);
            } else {
                unreachedStatuses.add(status);
            }
        }

        // 对已到达的状态按创建时间排序
        reachedStatuses.sort((s1, s2) -> {
            if (s1.getCreateTime() != null && s2.getCreateTime() != null) {
                return s1.getCreateTime().compareTo(s2.getCreateTime());
            } else if (s1.getCreateTime() != null) {
                return -1;
            } else {
                return 1;
            }
        });

        // 合并已到达和未到达的状态（已到达的在前，未到达的在后）
        statuses.addAll(reachedStatuses);
        statuses.addAll(unreachedStatuses);

        return new WorkOrderStageVO(stageName, statuses);
    }

    /**
     * 查找匹配的流程记录
     * 查找所有匹配的流程记录
     *
     * @param actualFlows 实际流程记录
     * @param statusName  状态名称
     * @param flowStatus  流程状态码
     * @return 匹配的流程记录，没有则返回null
     * @return 匹配的流程记录列表，没有则返回空列表
     */
    private GdWorkOrderFlowEntity findMatchingFlow(List<GdWorkOrderFlowEntity> actualFlows, String statusName, String flowStatus) {
        for (GdWorkOrderFlowEntity flow : actualFlows) {
            if (flow.getFlowStatus().equals(flowStatus) && flow.getFlowName().equals(statusName)) {
                return flow;
    private List<GdWorkOrderFlowEntity> findMatchingFlows(List<GdWorkOrderFlowEntity> actualFlows, String statusName, String flowStatus) {
        List<GdWorkOrderFlowEntity> matchingFlows = new ArrayList<>();
        if (actualFlows != null) {
            for (GdWorkOrderFlowEntity flow : actualFlows) {
                if (flow.getFlowStatus().equals(flowStatus) && flow.getFlowName().equals(statusName)) {
                    matchingFlows.add(flow);
                }
            }
        }
        return null;
        return matchingFlows;
    }

}

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

@@ -235,7 +235,17 @@
        }
        boolean updateResult = updateById(workOrder);

        // 5. 保存流转记录
        // 5. 把待验收的都改为待签收状态
        if (operationType == 10) {
            return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
                .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
                .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
                .in(GdPatrolTaskEntity::getTaskStatus,
                    PatrolTaskStatusEnum.AUDIT_PASSED.getValue(),
                    PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue())
            );
        }
        // 6. 保存流转记录
        if (updateResult) {
            GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
            flowEntity.setCreateUser(AuthUtil.getUserId());
@@ -249,14 +259,6 @@
            flowEntity.setAreaCode(workOrder.getAreaCode());
            flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
            return gdWorkOrderFlowService.save(flowEntity);
        }
        // 6. 把待验收的都改为待签收状态
        if (operationType == 10) {
            return gdPatrolTaskService.update(Wrappers.<GdPatrolTaskEntity>lambdaUpdate()
                .set(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.PENDING_SIGNING.getValue())
                .eq(GdPatrolTaskEntity::getWorkOrderId, workOrder.getId())
                .eq(GdPatrolTaskEntity::getTaskStatus, PatrolTaskStatusEnum.AUDIT_PASSED.getValue())
            );
        }

        return false;

 drone-service/drone-gd/src/main/java/org/sxkj/gd/xingtu/JianXingtuApiService.java

@@ -1,6 +1,7 @@
package org.sxkj.gd.xingtu;

import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
@@ -23,6 +24,7 @@
 * @Date 2026/1/26 15:22
 * @Version 1.0
 */
@Slf4j
@Service
public class JianXingtuApiService {

@@ -123,9 +125,10 @@
        }
        HttpHeaders headers = new HttpHeaders();
        headers.set("authorization", token);

        log.info("请求外部接口: {} {}", url, body);
        HttpEntity<Object> entity = new HttpEntity<>(body, headers);
        ResponseEntity<R> response = restTemplate.exchange(url, HttpMethod.POST, entity, R.class);
        log.info("响应外部接口: {}", response);
        if (response.getStatusCode().is2xxSuccessful()) {
            R responseBody = response.getBody();
            if (responseBody != null) {