From c84e916b8c020a987119570a3b2b89cce9a1925e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 04 Feb 2026 20:40:33 +0800
Subject: [PATCH] 工单优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 94 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 30 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 3dd2510..c8387e6 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
@@ -19,23 +19,25 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.FileUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
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.FileUtil;
-import org.springblade.core.tool.utils.StringUtil;
+import org.sxkj.gd.common.GdMultipartFileUtil;
import org.sxkj.gd.workorder.dto.GdXingtuFlyTaskSaveDTO;
-import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
@@ -47,13 +49,12 @@
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.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.vo.GdPatrolTaskVO;
-import org.sxkj.gd.common.GdMultipartFileUtil;
import org.sxkj.gd.xingtu.JianXingtuApiService;
import org.sxkj.resource.entity.Attach;
import org.sxkj.resource.feign.IAttachClient;
@@ -65,10 +66,7 @@
import java.io.File;
import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.*;
/**
* 巡查任务表 服务实现类
@@ -76,14 +74,12 @@
* @author lw
* @since 2026-01-14
*/
+@Slf4j
@Service
public class GdPatrolTaskServiceImpl extends BaseServiceImpl<GdPatrolTaskMapper, GdPatrolTaskEntity> implements IGdPatrolTaskService {
@Autowired
private IGdWorkOrderFlowService gdWorkOrderFlowService;
-
- // @Autowired
- // private IGdWorkOrderService gdWorkOrderService;
@Autowired
private ISysClient sysClient;
@Autowired
@@ -99,7 +95,10 @@
@Override
public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdPatrolTask.setDeptList(deptList);
List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
return page.setRecords(gdPatrolTaskVOS);
@@ -479,7 +478,6 @@
}
-
/**
* 根据部门ID获取部门名称
*
@@ -671,23 +669,59 @@
}
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirportId())) {
param.setAirportId(gdPatrolTaskVO.getAirportId());
- // GdManageDeviceEntity device = null;
- // if (StringUtils.isNumeric(taskEntity.getAirportId())) {
- // device = gdManageDeviceService.getById(Long.valueOf(taskEntity.getDeviceId()));
- // }
- // if (device == null) {
- // device = gdManageDeviceService.lambdaQuery()
- // .eq(GdManageDeviceEntity::getAirportId, taskEntity.getDeviceId())
- // .one();
- // }
- // if (device != null && StringUtil.isNotBlank(device.getAirportId())) {
- // param.setAirportId(device.getAirportId());
- // } else {
- // param.setAirportId(taskEntity.getAirportId());
- // }
}
param.setStatus("待执行");
param.setTaskType("航线飞行");
return param;
}
+
+ @Override
+ public GdPatrolTaskVO getPatrolTaskDetail(GdPatrolTaskEntity gdPatrolTaskEntity) {
+ return baseMapper.getPatrolTaskDetail(gdPatrolTaskEntity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class) // 添加事务注解，确保数据一致性
+ public boolean updatePatrolTaskById(GdPatrolTaskEntity auditParam) {
+ // 1. 更新当前任务状态
+ boolean updateResult = updateById(auditParam);
+ if (!updateResult) {
+ log.warn("更新任务失败，任务ID: {}");
+ return false;
+ }
+
+ // 2. 获取当前任务实体（优先使用 auditParam 中的数据，避免重复查询）
+ GdPatrolTaskEntity patrolTaskEntity = Optional.ofNullable(getById(auditParam.getId()))
+ .orElseThrow(() -> new RuntimeException("任务不存在，任务ID: " + auditParam.getId()));
+
+ // 3. 保存巡查工单流转
+ saveWorkOrderFlow(patrolTaskEntity.getWorkOrderId(), PatrolTaskStatusEnum.PENDING_ACCEPTANCE, null, null);
+
+ // 4. 查询同一个工单下的所有子任务
+ List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
+ .eq(GdPatrolTaskEntity::getWorkOrderId, patrolTaskEntity.getWorkOrderId()));
+
+ // 5. 判空处理，防止 NullPointerException
+ if (CollectionUtils.isEmpty(subTasks)) {
+ log.info("工单ID {} 下无子任务", patrolTaskEntity.getWorkOrderId());
+ return true;
+ }
+
+ // 6. 判断是否有小于待验收的工单（统一使用枚举值比较）
+ boolean hasLessThanPendingAcceptance = subTasks.stream()
+ .map(GdPatrolTaskEntity::getTaskStatus)
+ .filter(Objects::nonNull)
+ .anyMatch(status -> status.compareTo(PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getValue()) < 0);
+
+ // 7. 根据判断结果决定是否更新工单状态
+ if (!hasLessThanPendingAcceptance) {
+ updateWorkOrderStatusAndFlow(patrolTaskEntity.getWorkOrderId(), WorkOrderStatusEnum.COMPLETED_TO_BE_INSPECTED);
+ log.info("工单ID {} 下所有子任务均已达到待验收状态，更新工单状态为完成待验", patrolTaskEntity.getWorkOrderId());
+ } else {
+ log.warn("工单ID {} 下存在未达待验收状态的子任务", patrolTaskEntity.getWorkOrderId());
+ }
+
+ return updateResult;
+ }
+
}
--
Gitblit v1.9.3