From ef327df373735b12450fb2e2eb107de29552d99a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 05 Jun 2026 18:13:12 +0800
Subject: [PATCH] fix(workorder): 修复工单和巡检任务查询的类型匹配问题
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 168 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 131 insertions(+), 37 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 a3335f6..9660d53 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,6 +16,7 @@
*/
package org.sxkj.gd.workorder.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -47,6 +48,7 @@
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.service.IGdManageDeviceService;
@@ -54,6 +56,7 @@
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.GdPatrolTaskSimpleVO;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.xingtu.JianXingtuApiService;
import org.sxkj.resource.entity.Attach;
@@ -93,18 +96,19 @@
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()) {
- deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ if (!AuthUtil.isAdministrator() || !AuthUtil.isAdmin()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
}
gdPatrolTask.setDeptList(deptList);
List<GdPatrolTaskVO> gdPatrolTaskVOS = baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask);
return page.setRecords(gdPatrolTaskVOS);
}
-
@Override
public List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper) {
@@ -118,15 +122,41 @@
@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());
// 生成巡查任务编号
if (StringUtils.isBlank(gdPatrolTaskEntity.getTaskNo())) {
// 使用时间戳生成唯一巡查任务编号
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());
@@ -139,14 +169,15 @@
// 保存流转记录（发布任务，等待接单）
GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
- gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
+ gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
gdWorkOrderFlowEntity.setFlowDesc(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
- gdWorkOrderFlowEntity.setOperator(AuthUtil.getNickName());
+ gdWorkOrderFlowEntity.setOperator(StringUtil.isBlank(AuthUtil.getNickName()) ? "系统" : AuthUtil.getNickName());
gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
- gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
- gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ // 使用局部变量areaCode，防止空指针
+ gdWorkOrderFlowEntity.setAreaCode(areaCode != null ? areaCode : "");
+ gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
if (!save1) {
// 流转记录保存失败，抛出异常触发回滚
@@ -212,7 +243,7 @@
// 4. 更新任务状态
Date now = new Date();
task.setTaskStatus(newStatusEnum.getValue());
- task.setUpdateUser(AuthUtil.getUserId());
+ task.setUpdateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
task.setUpdateTime(now);
task.setRejectReason(auditParam.getRejectReason());
boolean updateResult = updateById(task);
@@ -239,16 +270,16 @@
}
}
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);
}
@@ -327,15 +358,15 @@
// 2. 保存流转记录
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
- flowEntity.setCreateUser(AuthUtil.getUserId());
+ flowEntity.setCreateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrderId);
flowEntity.setFlowName(newStatus.getStageDesc());
flowEntity.setFlowDesc(newStatus.getDesc());
- flowEntity.setOperator(AuthUtil.getNickName());
+ flowEntity.setOperator(StringUtil.isBlank(AuthUtil.getNickName()) ? "系统" : AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.WORK_ORDER_TASK.getValue());
flowEntity.setFlowStatus(newStatus.getMaxCode());
flowEntity.setWorkStatus(newStatus.getCode());
- flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ flowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
}
@@ -377,7 +408,7 @@
taskEntity.setTaskStatus(targetStatus.getValue());
// 4. 更新任务信息：合并传入的任务信息
- taskEntity.setUpdateUser(AuthUtil.getUserId());
+ taskEntity.setUpdateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
taskEntity.setUpdateTime(new Date());
// 5. 更新数据库
@@ -388,14 +419,14 @@
// 6. 保存流转记录：使用枚举设置flowName
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
- flowEntity.setCreateUser(AuthUtil.getUserId());
+ flowEntity.setCreateUser(AuthUtil.getUserId() == null ? 0L : 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.setFlowDesc((StringUtil.isBlank(AuthUtil.getNickName()) ? "系统" : AuthUtil.getNickName()) + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 更新了任务信息，状态转换为：" + targetStatus.getDesc());
+ flowEntity.setOperator(StringUtil.isBlank(AuthUtil.getNickName()) ? "系统" : AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
flowEntity.setAreaCode(existingTask.getAreaCode());
- flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ flowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
return gdWorkOrderFlowService.save(flowEntity);
}
@@ -467,14 +498,14 @@
private boolean saveWorkOrderFlow(Long workOrderId, PatrolTaskStatusEnum newStatus,
String rejectReason, String areaCode) {
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
- flowEntity.setCreateUser(AuthUtil.getUserId());
+ flowEntity.setCreateUser(AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrderId);
flowEntity.setFlowName(newStatus.getStageDesc());
flowEntity.setFlowDesc(newStatus.getStageDesc());
- flowEntity.setOperator(AuthUtil.getNickName());
+ flowEntity.setOperator(StringUtil.isBlank(AuthUtil.getNickName()) ? "系统" : AuthUtil.getNickName());
flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
flowEntity.setAreaCode(areaCode);
- flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ flowEntity.setCreateDept(Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId()));
boolean saveResult = gdWorkOrderFlowService.save(flowEntity);
if (!saveResult) {
@@ -544,8 +575,8 @@
if (bladeFile == null || StringUtil.isBlank(bladeFile.getLink())) {
throw new RuntimeException("附件上传失败");
}
- Integer resultType = parseResultType(taskEntity != null ? taskEntity.getPatrolTaskType() : null);
- Attach attach = buildAttachInfo(taskEntity, reportFile, bladeFile, resultType, desiredName);
+ // Integer resultType = parseResultType(taskEntity != null ? taskEntity.getPatrolTaskType() : null);
+ Attach attach = buildAttachInfo(taskEntity, reportFile, bladeFile, taskEntity.getPatrolTaskType(), desiredName);
Boolean saved = attachClient.saveAttachInfo(attach);
if (!Boolean.TRUE.equals(saved)) {
log.error("附件信息保存失败，报告文件:" + desiredName);
@@ -564,7 +595,7 @@
* @param desiredName 期望文件名
* @return 附件信息
*/
- private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType, String desiredName) {
+ private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, List<List<String>> resultType, String desiredName) {
Attach attach = new Attach();
attach.setDomainUrl(bladeFile.getDomain());
attach.setLink(bladeFile.getLink());
@@ -572,19 +603,19 @@
attach.setOriginalName(bladeFile.getOriginalName());
attach.setAttachSize(reportFile.length());
attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
- attach.setResultType(resultType);
+ attach.setResultType(JSON.toJSONString(resultType));
attach.setPatrolTaskId(String.valueOf(taskEntity != null ? taskEntity.getId() : null));
Long createUser = taskEntity != null ? taskEntity.getCreateUser() : null;
Long updateUser = taskEntity != null ? taskEntity.getUpdateUser() : null;
Long createDept = taskEntity != null ? taskEntity.getCreateDept() : null;
if (createUser == null) {
- createUser = AuthUtil.getUserId();
+ createUser = AuthUtil.getUserId() == null ? 0L : AuthUtil.getUserId();
}
if (updateUser == null) {
updateUser = createUser;
}
if (createDept == null) {
- createDept = Long.valueOf(AuthUtil.getDeptId());
+ createDept = Long.valueOf(StringUtil.isBlank(AuthUtil.getDeptId()) ? "0" : AuthUtil.getDeptId());
}
Date now = new Date();
attach.setCreateUser(createUser);
@@ -641,7 +672,7 @@
return R.fail("巡查任务不存在");
}
GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
- return jianXingtuApiService.saveFlyTask(param);
+ return jianXingtuApiService.saveFlyTask(param);
}
/**
@@ -657,11 +688,11 @@
} else if (StringUtil.isNotBlank(gdPatrolTaskVO.getTaskNo())) {
param.setName(gdPatrolTaskVO.getTaskNo());
}
- if (StringUtil.isNotBlank(gdPatrolTaskVO.getPatrolTaskType())) {
- param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
- }
+ // if (StringUtil.isNotBlank(gdPatrolTaskVO.getPatrolTaskType())) {
+ // param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
+ // }
if ((gdPatrolTaskVO.getId() != null)) {
- param.setPatrolTaskld(String.valueOf(gdPatrolTaskVO.getId()));
+ param.setPatrolTaskId(String.valueOf(gdPatrolTaskVO.getId()));
}
param.setTimingType("单次执行");
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirlineId())) {
@@ -669,15 +700,32 @@
}
if (gdPatrolTaskVO.getExecuteTime() != null) {
param.setSingleTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
- }
+ }
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAreaCode())) {
- param.setRegionCode(gdPatrolTaskVO.getAreaCode());
+ // regionCode : "3600,3608,360802"
+ String regionCode = convertAreaCodeToRegionCode(gdPatrolTaskVO.getAreaCode());
+ param.setRegionCode(regionCode);
}
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAirportId())) {
param.setAirportId(gdPatrolTaskVO.getAirportId());
}
+ if (StringUtil.isNotBlank(gdPatrolTaskVO.getDeviceFlyerId())) {
+ param.setDeviceFlyerId(gdPatrolTaskVO.getDeviceFlyerId());
+ }
+ if (gdPatrolTaskVO.getAlgorithmIds() != null && !gdPatrolTaskVO.getAlgorithmIds().isEmpty()) {
+ // 将 List<String> 转换为逗号分隔的字符串
+ String algorithmIdStr = String.join(",", gdPatrolTaskVO.getAlgorithmIds());
+ param.setAlgorithmId(algorithmIdStr);
+ }
+ // 机构
+ param.setDeptId(gdPatrolTaskVO.getCreateDept());
+ // 巡检类型
+ param.setInspectionTypeArr(gdPatrolTaskVO.getPatrolTaskType());
+ // param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
+ // 机巢名称
+ param.setAirportName(gdPatrolTaskVO.getDeviceName());
param.setStatus("待执行");
- param.setTaskType("航线飞行");
+ param.setTaskType("定时飞行");
return param;
}
@@ -730,4 +778,50 @@
return updateResult;
}
+ @Override
+ public List<GdPatrolTaskSimpleVO> selectListByWorkOrderId(Long workOrderId) {
+ return baseMapper.selectListByWorkOrderId(workOrderId);
+ }
+
+ /**
+ * 将区域编码转换为多级行政区划编码格式
+ *
+ * @param areaCode 区域编码（如：360802）
+ * @return 多级行政区划编码，格式为 "省编码,市编码,区编码"（如："3600,3608,360802"）
+ */
+ private String convertAreaCodeToRegionCode(String areaCode) {
+ if (StringUtil.isBlank(areaCode)) {
+ return null;
+ }
+
+ // 如果已经是逗号分隔的格式，直接返回
+ if (areaCode.contains(",")) {
+ return areaCode;
+ }
+
+ // 去除空格并确保长度为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;
+ }
+
+ try {
+ // 提取省、市、区三级编码
+ String provinceCode = cleanCode.substring(0, 2) + "00"; // 省级编码（如：3600）
+ String cityCode = cleanCode.substring(0, 4); // 市级编码（如：3608）
+ String districtCode = cleanCode; // 区级编码（如：360802）
+
+ return provinceCode + "," + cityCode + "," + districtCode;
+ } catch (Exception e) {
+ log.error("区域编码转换失败: {}", e.getMessage());
+ return areaCode;
+ }
+ }
+
}
--
Gitblit v1.9.3