From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 100 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 20 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 b3ee4b7..36e1344 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
@@ -48,13 +48,16 @@
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.mapper.GdPatrolTaskMapper;
+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;
@@ -95,11 +98,13 @@
private JianXingtuApiService jianXingtuApiService;
@Autowired
private IGdManageDeviceService gdManageDeviceService;
+ @Autowired
+ private GdWorkOrderMapper gdWorkOrderMapper;
@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);
@@ -119,8 +124,30 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
+ // 参数校验：防止空指针
+ if (taskEntityList == null || taskEntityList.isEmpty()) {
+ throw new RuntimeException("任务列表不能为空");
+ }
+
+ // 获取第一个任务的工单ID
+ Long workOrderId = taskEntityList.get(0).getWorkOrderId();
+ if (workOrderId == null) {
+ throw new RuntimeException("工单ID不能为空");
+ }
+
+ // 查询工单信息
+ GdWorkOrderEntity gdWorkOrderEntity = gdWorkOrderMapper.selectById(workOrderId);
+ if (gdWorkOrderEntity == null) {
+ throw new RuntimeException("工单不存在，工单ID: " + workOrderId);
+ }
+
// 更新流程节点
for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
+ if (gdPatrolTaskEntity == null) {
+ log.warn("跳过空任务对象");
+ continue;
+ }
+
// 设置航线ID
gdPatrolTaskEntity.setAirlineId(gdPatrolTaskEntity.getPatrolRouteUrl());
// 生成巡查任务编号
@@ -129,7 +156,9 @@
String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.PATROL_TASK_KEY);
gdPatrolTaskEntity.setTaskNo(WordOrderConstant.PATROL_TASK_PREFIX + timestamp);
}
-
+ // 从工单实体中获取区域编码，防止空指针
+ String areaCode = gdWorkOrderEntity.getAreaCode();
+ gdPatrolTaskEntity.setAreaCode(areaCode != null ? areaCode : "");
// 设置初始状态为待签收（对应流程图：等待接单）
gdPatrolTaskEntity.setTaskStatus(PatrolTaskStatusEnum.PENDING_SIGNING.getValue());
@@ -148,7 +177,8 @@
gdWorkOrderFlowEntity.setFlowDesc(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
gdWorkOrderFlowEntity.setOperator(StringUtil.isBlank(AuthUtil.getNickName()) ? "系统" : AuthUtil.getNickName());
gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
- gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
+ // 使用局部变量areaCode，防止空指针
+ gdWorkOrderFlowEntity.setAreaCode(areaCode != null ? areaCode : "");
gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
if (!save1) {
@@ -228,7 +258,13 @@
// 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
if (auditStatus == 4) {
// 将审核后的任务信息推送到星图
- pushXingtuFlyTask(auditParam.getId());
+ R pushResult = pushXingtuFlyTask(auditParam.getId());
+ // 检查推送结果，如果失败则抛出异常回滚事务
+ if (pushResult != null && !pushResult.isSuccess()) {
+ String errorMsg = pushResult.getMsg();
+ log.error("推送星图飞行任务失败: {}", errorMsg);
+ throw new RuntimeException(errorMsg + "，请更改执行时间重新提交。");
+ }
// 查询同一个工单下的所有子任务
List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
@@ -242,19 +278,15 @@
}
}
if (auditStatus == 3) {
- // 撤回任务操作：查询同一个工单下的所有子任务
+ // 撤回任务操作：使用状态聚合工具类计算主任务状态
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);
}
// 7. 验收拒绝
if (auditStatus == 7) {
@@ -575,7 +607,7 @@
attach.setOriginalName(bladeFile.getOriginalName());
attach.setAttachSize(reportFile.length());
attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
- attach.setResultType(JSON.toJSONString(resultType));
+ attach.setResultType(resultType);
attach.setPatrolTaskId(String.valueOf(taskEntity != null ? taskEntity.getId() : null));
Long createUser = taskEntity != null ? taskEntity.getCreateUser() : null;
Long updateUser = taskEntity != null ? taskEntity.getUpdateUser() : null;
@@ -712,7 +744,7 @@
// 1. 更新当前任务状态
boolean updateResult = updateById(auditParam);
if (!updateResult) {
- log.warn("更新任务失败，任务ID: {}");
+ log.warn("更新任务失败，任务ID: {}", auditParam.getId());
return false;
}
@@ -720,8 +752,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()
@@ -756,8 +791,28 @@
}
/**
+ * 查询待验收状态的巡查任务列表（对外接口）
+ *
+ * @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）
* @return 多级行政区划编码，格式为 "省编码,市编码,区编码"（如："3600,3608,360802"）
*/
@@ -773,6 +828,11 @@
// 去除空格并确保长度为6位
String cleanCode = areaCode.trim();
+ // 如果长度大于6位，只取前6位
+ if (cleanCode.length() > 6) {
+ log.warn("区域编码长度超过6位，截取前6位: {}", cleanCode);
+ cleanCode = cleanCode.substring(0, 6);
+ }
if (cleanCode.length() != 6) {
log.warn("区域编码格式不正确，期望6位数字，实际为: {}", cleanCode);
return cleanCode;
@@ -781,7 +841,7 @@
try {
// 提取省、市、区三级编码
String provinceCode = cleanCode.substring(0, 2) + "00"; // 省级编码（如：3600）
- String cityCode = cleanCode.substring(0, 4) + "0"; // 市级编码（如：3608）
+ String cityCode = cleanCode.substring(0, 4); // 市级编码（如：3608）
String districtCode = cleanCode; // 区级编码（如：360802）
return provinceCode + "," + cityCode + "," + districtCode;
--
Gitblit v1.9.3