From 4f4872af1eef1c14d95f04bffe2a4f2d2f7d835d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 26 Jan 2026 16:33:43 +0800
Subject: [PATCH] 巡查任务优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 154 insertions(+), 5 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 d6fce0c..0946714 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
@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +29,12 @@
import org.springframework.transaction.annotation.Transactional;
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.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
@@ -39,9 +45,20 @@
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.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.resource.entity.Attach;
+import org.sxkj.resource.feign.IAttachClient;
+import org.sxkj.system.entity.Dept;
+import org.sxkj.system.entity.User;
+import org.sxkj.system.feign.ISysClient;
+import org.sxkj.system.feign.IUserClient;
+import java.io.File;
+import java.io.IOException;
import java.util.Date;
import java.util.List;
@@ -59,7 +76,14 @@
// @Autowired
// private IGdWorkOrderService gdWorkOrderService;
-
+ @Autowired
+ private ISysClient sysClient;
+ @Autowired
+ private IUserClient userClient;
+ @Autowired
+ private IAttachClient attachClient;
+ @Autowired
+ private IGdTaskResultService gdTaskResultService;
@Override
public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskPageParam gdPatrolTask, List<Long> deptIdList) {
return page.setRecords(baseMapper.selectGdPatrolTaskPage(page, gdPatrolTask, deptIdList));
@@ -101,7 +125,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());
@@ -277,10 +301,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
+ public boolean republishPatrolTask(GdPatrolTaskEntity taskEntity) {
if (taskEntity == null || taskEntity.getId() == null) {
throw new RuntimeException("任务信息或ID不能为空");
- }
+ }
// 1. 验证任务是否存在
GdPatrolTaskEntity existingTask = getById(taskEntity.getId());
@@ -337,6 +361,28 @@
return gdWorkOrderFlowService.save(flowEntity);
}
+ @Override
+ public boolean exportPatrolReport(Long patrolTaskId) {
+ if (patrolTaskId == null) {
+ throw new RuntimeException("巡查任务主键不能为空");
+ }
+ GdPatrolTaskEntity taskEntity = getById(patrolTaskId);
+ if (taskEntity == null) {
+ throw new RuntimeException("巡查任务不存在");
+ }
+ List<GdTaskResultEntity> resultList = gdTaskResultService.list(Wrappers.<GdTaskResultEntity>lambdaQuery()
+ .eq(GdTaskResultEntity::getPatrolTaskId, patrolTaskId)
+ .eq(GdTaskResultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED));
+ String creatorName = getUserName(taskEntity.getCreateUser());
+ String deptName = getDeptName(taskEntity.getCreateDept());
+ try {
+ File reportFile = GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
+ return saveAttachFile(reportFile, taskEntity);
+ } catch (Exception e) {
+ throw new RuntimeException("生成巡查报告失败", e);
+ }
+ }
+
/**
* 检查拒绝原因是否必填
@@ -370,7 +416,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);
@@ -411,5 +457,108 @@
return baseDesc + newStatus.getDesc();
}
+ private String getDeptName(Long deptId) {
+ if (deptId == null) {
+ return "/";
+ }
+ R<Dept> deptResult = sysClient.getDept(deptId);
+ Dept dept = deptResult != null ? deptResult.getData() : null;
+ if (dept == null || StringUtil.isBlank(dept.getDeptName())) {
+ return "/";
+ }
+ return dept.getDeptName();
+ }
+
+ private String getUserName(Long userId) {
+ if (userId == null) {
+ return "/";
+ }
+ R<User> userResult = userClient.userInfoById(userId);
+ User user = userResult != null ? userResult.getData() : null;
+ if (user == null) {
+ return "/";
+ }
+ String realName = user.getRealName();
+ if (StringUtil.isBlank(realName)) {
+ realName = user.getName();
+ }
+ return StringUtil.isBlank(realName) ? "/" : realName;
+ }
+
+ private boolean saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
+ if (reportFile == null || !reportFile.exists()) {
+ throw new RuntimeException("巡查报告文件不存在");
+ }
+ String desiredName = buildReportAttachName(taskEntity, reportFile.getName());
+ BladeFile bladeFile = attachClient.putFile(
+ GdMultipartFileUtil.fromFile(reportFile,
+ "application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
+ 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, desiredName);
+ Boolean saved = attachClient.saveAttachInfo(attach);
+ if (!Boolean.TRUE.equals(saved)) {
+ log.error("附件信息保存失败，报告文件:" + desiredName);
+ return false;
+ }
+ return true;
+ }
+
+ 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(desiredName);
+ attach.setOriginalName(desiredName);
+ attach.setAttachSize(reportFile.length());
+ attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
+ attach.setResultType(resultType);
+ 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();
+ }
+ if (updateUser == null) {
+ updateUser = createUser;
+ }
+ if (createDept == null) {
+ createDept = Long.valueOf(AuthUtil.getDeptId());
+ }
+ Date now = new Date();
+ attach.setCreateUser(createUser);
+ attach.setUpdateUser(updateUser);
+ attach.setCreateDept(createDept);
+ attach.setCreateTime(now);
+ attach.setUpdateTime(now);
+ 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;
+ }
+ try {
+ Integer type = Integer.valueOf(patrolTaskType);
+ if (type < 1 || type > 5) {
+ return null;
+ }
+ return type;
+ } catch (NumberFormatException ex) {
+ return null;
+ }
+ }
}
--
Gitblit v1.9.3