From ff2ee260472e3b43c6dfd4b1406b629dfeb2d3f4 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 19:33:04 +0800
Subject: [PATCH] 吉安航线任务推送
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 139 insertions(+), 17 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 98cef1a..1372e7e 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
@@ -25,6 +25,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
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.sxkj.common.constant.WordOrderConstant;
@@ -33,6 +34,8 @@
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.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;
@@ -45,13 +48,16 @@
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.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;
+import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
import org.sxkj.system.feign.ISysClient;
@@ -84,9 +90,13 @@
private IAttachClient attachClient;
@Autowired
private IGdTaskResultService gdTaskResultService;
+ @Autowired
+ private JianXingtuApiService jianXingtuApiService;
+ @Autowired
+ private IGdManageDeviceService gdManageDeviceService;
@Override
- public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
- return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
+ public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask) {
+ return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()))));
}
@@ -125,7 +135,7 @@
GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
- gdWorkOrderFlowEntity.setFlowName("任务发布");
+ gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
@@ -208,6 +218,8 @@
boolean b = saveWorkOrderFlow(task.getId(), newStatusEnum, auditParam.getRejectReason(), task.getAreaCode());
// 6. 判断是否审核成功，如果是，需要判断是否整个订单的子任务都审核成功了，除了被撤回和验收拒绝的
if (auditStatus == 4) {
+ //将审核后的任务信息推送到星图
+ pushXingtuFlyTask(auditParam.getId());
// 查询同一个工单下的所有子任务
List<GdPatrolTaskEntity> subTasks = list(Wrappers.<GdPatrolTaskEntity>lambdaQuery()
.eq(GdPatrolTaskEntity::getWorkOrderId, task.getWorkOrderId()));
@@ -236,7 +248,9 @@
boolean allSubTasksAudited = checkAllSubTasksStatus(subTasks, PatrolTaskStatusEnum.ACCEPTANCE_PASSED);
// 这里可以根据allSubTasksAudited的结果执行后续逻辑，比如更新工单状态等
if (allSubTasksAudited) {
- // 执行工单状态更新逻辑
+ // 1.验收通过,生成报告
+ asyncExportPatrolReport(task.getId());
+ // 2.执行工单状态更新逻辑
return updateWorkOrderStatusAndFlow(task.getWorkOrderId(),
WorkOrderStatusEnum.ACCEPTED_TO_BE_SETTLED);
}
@@ -362,7 +376,7 @@
}
@Override
- public File exportPatrolReport(Long patrolTaskId) {
+ public boolean exportPatrolReport(Long patrolTaskId) {
if (patrolTaskId == null) {
throw new RuntimeException("巡查任务主键不能为空");
}
@@ -377,13 +391,26 @@
String deptName = getDeptName(taskEntity.getCreateDept());
try {
File reportFile = GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
- saveAttachFile(reportFile, taskEntity);
- return reportFile;
+ return saveAttachFile(reportFile, taskEntity);
} catch (Exception e) {
throw new RuntimeException("生成巡查报告失败", e);
}
}
+ /**
+ * 异步生成巡查报告
+ *
+ * @param patrolTaskId 巡查任务ID
+ */
+ @Async
+ public void asyncExportPatrolReport(Long patrolTaskId) {
+ try {
+ exportPatrolReport(patrolTaskId);
+ } catch (Exception e) {
+ // 记录异步执行错误日志
+ log.error("异步生成巡查报告失败，任务ID: {}");
+ }
+ }
/**
* 检查拒绝原因是否必填
@@ -417,7 +444,7 @@
GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
flowEntity.setCreateUser(AuthUtil.getUserId());
flowEntity.setWorkOrderId(workOrderId);
- flowEntity.setFlowName(newStatus.getDesc());
+ flowEntity.setFlowName(newStatus.getStageDesc());
// 构建流转描述
String flowDesc = buildFlowDesc(newStatus, rejectReason);
@@ -486,37 +513,39 @@
return StringUtil.isBlank(realName) ? "/" : realName;
}
- private BladeFile saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
+ private boolean saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
if (reportFile == null || !reportFile.exists()) {
throw new RuntimeException("巡查报告文件不存在");
}
- String fileName = reportFile.getName();
+ String desiredName = buildReportAttachName(taskEntity, reportFile.getName());
BladeFile bladeFile = attachClient.putFile(
GdMultipartFileUtil.fromFile(reportFile,
"application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
- fileName
+ desiredName
);
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);
+ Attach attach = buildAttachInfo(taskEntity, reportFile, bladeFile, resultType, desiredName);
Boolean saved = attachClient.saveAttachInfo(attach);
if (!Boolean.TRUE.equals(saved)) {
- log.error("附件信息保存失败，报告文件:"+fileName);
+ log.error("附件信息保存失败，报告文件:" + desiredName);
+ return false;
}
- return bladeFile;
+ return true;
}
- private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType) {
+ private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType, String desiredName) {
Attach attach = new Attach();
attach.setDomainUrl(bladeFile.getDomain());
attach.setLink(bladeFile.getLink());
- attach.setName(bladeFile.getName());
- attach.setOriginalName(StringUtil.isBlank(bladeFile.getOriginalName()) ? reportFile.getName() : bladeFile.getOriginalName());
+ attach.setName(desiredName);
+ attach.setOriginalName(desiredName);
attach.setAttachSize(reportFile.length());
attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
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;
Long createDept = taskEntity != null ? taskEntity.getCreateDept() : null;
@@ -538,6 +567,14 @@
return attach;
}
+ private String buildReportAttachName(GdPatrolTaskEntity taskEntity, String fallbackName) {
+ String taskNo = taskEntity != null ? taskEntity.getTaskNo() : null;
+ if (StringUtil.isBlank(taskNo)) {
+ return fallbackName;
+ }
+ return taskNo + ".docx";
+ }
+
private Integer parseResultType(String patrolTaskType) {
if (StringUtil.isBlank(patrolTaskType)) {
return null;
@@ -553,4 +590,89 @@
}
}
+ @Override
+ public R pushXingtuFlyTask(Long patrolTaskId) {
+ if (patrolTaskId == null) {
+ return R.fail("巡查任务主键不能为空");
+ }
+ GdPatrolTaskEntity taskEntity = getById(patrolTaskId);
+ if (taskEntity == null) {
+ return R.fail("巡查任务不存在");
+ }
+ GdXingtuFlyTaskSaveDTO param = buildXingtuFlyTask(taskEntity);
+ return jianXingtuApiService.saveFlyTask(param);
+ }
+
+ private GdXingtuFlyTaskSaveDTO buildXingtuFlyTask(GdPatrolTaskEntity taskEntity) {
+ GdXingtuFlyTaskSaveDTO param = new GdXingtuFlyTaskSaveDTO();
+ if (StringUtil.isNotBlank(taskEntity.getPatrolTaskName())) {
+ param.setName(taskEntity.getPatrolTaskName());
+ } else if (StringUtil.isNotBlank(taskEntity.getTaskNo())) {
+ param.setName(taskEntity.getTaskNo());
+ }
+ if (StringUtil.isNotBlank(taskEntity.getPatrolTaskType())) {
+ param.setInspectionType(taskEntity.getPatrolTaskType());
+ }
+ param.setTimingType("单次执行");
+ if (StringUtil.isNotBlank(taskEntity.getAirlineId())) {
+ param.setAirlineId(taskEntity.getAirlineId());
+ }
+ if (taskEntity.getExecuteTime() != null) {
+ param.setSingleTime(DateUtil.format(taskEntity.getExecuteTime(), "yyyy-MM-dd HH:mm:ss"));
+ }
+ if (StringUtil.isNotBlank(taskEntity.getAreaCode())) {
+ param.setRegionCode(taskEntity.getAreaCode());
+ }
+ if (StringUtil.isNotBlank(taskEntity.getDeviceId())) {
+ GdManageDeviceEntity device = null;
+ if (StringUtils.isNumeric(taskEntity.getDeviceId())) {
+ 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.getDeviceId());
+ }
+ }
+ String status = parseStatus(taskEntity.getTaskStatus());
+ if (StringUtil.isNotBlank(status)) {
+ param.setStatus(status);
+ }
+ param.setTaskType("定时执行");
+ return param;
+ }
+
+ private String parseStatus(String taskStatus) {
+ if (StringUtil.isBlank(taskStatus)) {
+ return null;
+ }
+ switch (taskStatus) {
+ case "0":
+ return "待签收";
+ case "1":
+ return "拒绝签收";
+ case "2":
+ return "已撤回";
+ case "3":
+ return "待审核";
+ case "4":
+ return "审核驳回";
+ case "5":
+ return "审核通过";
+ case "6":
+ return "待验收";
+ case "7":
+ return "拒绝验收";
+ case "8":
+ return "验收通过";
+ default:
+ return taskStatus;
+ }
+ }
+
}
--
Gitblit v1.9.3