From ad935c07a6cabf05fed9c615c7bd4f67f6d65293 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 04 Jun 2026 23:37:33 +0800
Subject: [PATCH] feat(common): 添加通用列表类型处理器支持数据库存储
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 ed9fdaf..c939bc2 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
@@ -547,8 +547,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);
@@ -567,7 +567,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());
@@ -575,7 +575,7 @@
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;
@@ -644,9 +644,7 @@
return R.fail("巡查任务不存在");
}
GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
- List<GdXingtuFlyTaskSaveDTO> paramList = new ArrayList<>();
- paramList.add(param);
- return jianXingtuApiService.saveFlyTask(paramList);
+ return jianXingtuApiService.saveFlyTask(param);
}
/**
@@ -662,9 +660,9 @@
} 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.setPatrolTaskId(String.valueOf(gdPatrolTaskVO.getId()));
}
@@ -674,8 +672,7 @@
}
if (gdPatrolTaskVO.getExecuteTime() != null) {
param.setSingleTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
- param.setExecuteTime(DateUtil.format(gdPatrolTaskVO.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
- }
+ }
if (StringUtil.isNotBlank(gdPatrolTaskVO.getAreaCode())) {
param.setRegionCode(gdPatrolTaskVO.getAreaCode());
}
@@ -685,14 +682,16 @@
if (StringUtil.isNotBlank(gdPatrolTaskVO.getDeviceFlyerId())) {
param.setDeviceFlyerId(gdPatrolTaskVO.getDeviceFlyerId());
}
- if (StringUtil.isNotBlank(JSON.toJSONString(gdPatrolTaskVO.getAlgorithmIds()))) {
- param.setAlgorithmId(JSON.toJSONString(gdPatrolTaskVO.getAlgorithmIds()));
+ if (gdPatrolTaskVO.getAlgorithmIds() != null && !gdPatrolTaskVO.getAlgorithmIds().isEmpty()) {
+ // 将 List<String> 转换为逗号分隔的字符串
+ String algorithmIdStr = String.join(",", gdPatrolTaskVO.getAlgorithmIds());
+ param.setAlgorithmId(algorithmIdStr);
}
// 机构
param.setDeptId(gdPatrolTaskVO.getCreateDept());
// 巡检类型
- param.setPatrolTaskType(gdPatrolTaskVO.getPatrolTaskType());
- param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
+ param.setInspectionTypeArr(gdPatrolTaskVO.getPatrolTaskType());
+ // param.setInspectionType(gdPatrolTaskVO.getPatrolTaskType());
// 机巢名称
param.setAirportName(gdPatrolTaskVO.getDeviceName());
param.setStatus("待执行");
--
Gitblit v1.9.3