From cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 21:42:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 362 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index 8daf5c8..45d26f7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -16,7 +16,24 @@
*/
package org.sxkj.gd.workorder.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.sxkj.common.constant.WordOrderConstant;
+import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+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;
@@ -25,6 +42,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.util.Date;
import java.util.List;
/**
@@ -36,9 +55,15 @@
@Service
public class GdPatrolTaskServiceImpl extends BaseServiceImpl<GdPatrolTaskMapper, GdPatrolTaskEntity> implements IGdPatrolTaskService {
+ @Autowired
+ private IGdWorkOrderFlowService gdWorkOrderFlowService;
+
+ @Autowired
+ private IGdWorkOrderService gdWorkOrderService;
+
@Override
- public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask) {
- return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask));
+ public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
+ return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
}
@@ -51,4 +76,339 @@
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);
+ }
+
+ // 设置初始状态为待签收（对应流程图：等待接单）
+ gdPatrolTaskEntity.setTaskStatus(PatrolTaskStatusEnum.PENDING_SIGNING.getValue());
+
+ // 保存巡逻任务
+ 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("任务发布");
+ gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
+ gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
+ 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);
+ boolean updateResult = updateById(task);
+ if (!updateResult) {
+ throw new RuntimeException("更新任务状态失败");
+ }
+
+ // 5. 保存流转记录
+ boolean b = saveWorkOrderFlow(task.getId(), newStatusEnum, auditParam.getRejectReason(), task.getAreaCode());
+ // 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
+ if (auditStatus == 4) {
+ // 查询同一个工单下的所有子任务
+ List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
+ .eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
+
+ // 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
+ boolean allSubTasksAudited = checkAllSubTasksAudited(subTasks);
+ // 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
+ // 示例：如果所有子任务都审核成功，可以更新工单状态为已完成
+ if (allSubTasksAudited) {
+ // 执行工单状态更新逻辑
+ // 注意：需要注入工单相关的Service才能执行更新
+ GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity();
+ gdWorkOrderEntity.setId(task.getWorkOrderId());
+ gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
+ boolean b1 = gdWorkOrderService.updateById(gdWorkOrderEntity);
+ if (b1) {
+ // 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);
+ }
+ }
+ }
+ // 7. 验收拒绝
+ if (auditStatus == 7) {
+ GdWorkOrderEntity gdWorkOrderEntity = new GdWorkOrderEntity();
+ gdWorkOrderEntity.setId(task.getWorkOrderId());
+ gdWorkOrderEntity.setWorkOrderStatus(WorkOrderStatusEnum.EXECUTING_TO_BE_COMPLETED.getCode());
+ boolean b1 = gdWorkOrderService.updateById(gdWorkOrderEntity);
+ if (b1) {
+ // 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 b;
+ }
+
+
+ /**
+ * 检查是否所有子任务都审核成功（除了被撤回和验收拒绝的）
+ *
+ * @param subTasks 子任务列表
+ * @return 是否所有子任务都审核成功
+ */
+ private boolean checkAllSubTasksAudited(List<GdPatrolTaskEntity> subTasks) {
+ for (GdPatrolTaskEntity subTask : subTasks) {
+ String taskStatus = subTask.getTaskStatus();
+ PatrolTaskStatusEnum statusEnum = PatrolTaskStatusEnum.getByValue(taskStatus);
+
+ // 如果任务状态不是审核成功状态，且不是被撤回和验收拒绝的，则返回false
+ if (!isTaskAuditSuccess(statusEnum) &&
+ statusEnum != PatrolTaskStatusEnum.WITHDRAWN &&
+ statusEnum != PatrolTaskStatusEnum.REJECTED_ACCEPTANCE) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * 判断单个任务是否审核成功
+ *
+ * @param statusEnum 任务状态枚举
+ * @return 是否审核成功
+ */
+ private boolean isTaskAuditSuccess(PatrolTaskStatusEnum statusEnum) {
+ // 审核成功的任务状态包括：审核通过
+ return statusEnum == PatrolTaskStatusEnum.AUDIT_PASSED ;
+ }
+
+ @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.getUserName() + " " + org.springblade.core.tool.utils.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());
+ flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+
+ return gdWorkOrderFlowService.save(flowEntity);
+ }
+
+
+ /**
+ * 检查拒绝原因是否必填
+ *
+ * @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.getDesc());
+
+ // 构建流转描述
+ String flowDesc = buildFlowDesc(newStatus, rejectReason);
+ flowEntity.setFlowDesc(flowDesc);
+
+ flowEntity.setOperator(AuthUtil.getUserName());
+ 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 = AuthUtil.getUserName() + " " +
+ org.springblade.core.tool.utils.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();
+ }
+ }
+
+
}
--
Gitblit v1.9.3