From fc32ccf83f95b46500cbb5b397a43a38a150beac Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 16:15:28 +0800
Subject: [PATCH] 附件上传

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java |   78 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 77 insertions(+), 1 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 eb7fc38..98cef1a 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;
@@ -30,6 +31,7 @@
 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;
@@ -47,12 +49,16 @@
 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;
 
@@ -74,6 +80,8 @@
 	private ISysClient sysClient;
 	@Autowired
 	private IUserClient userClient;
+	@Autowired
+	private IAttachClient attachClient;
 	@Autowired
 	private IGdTaskResultService gdTaskResultService;
     @Override
@@ -368,7 +376,9 @@
 		String creatorName = getUserName(taskEntity.getCreateUser());
 		String deptName = getDeptName(taskEntity.getCreateDept());
 		try {
-			return GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
+			File reportFile = GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
+			saveAttachFile(reportFile, taskEntity);
+			return reportFile;
 		} catch (Exception e) {
 			throw new RuntimeException("生成巡查报告失败", e);
 		}
@@ -476,5 +486,71 @@
 		return StringUtil.isBlank(realName) ? "/" : realName;
 	}
 
+	private BladeFile saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
+		if (reportFile == null || !reportFile.exists()) {
+			throw new RuntimeException("巡查报告文件不存在");
+		}
+		String fileName = reportFile.getName();
+		BladeFile bladeFile = attachClient.putFile(
+			GdMultipartFileUtil.fromFile(reportFile,
+				"application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
+			fileName
+		);
+		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);
+		Boolean saved = attachClient.saveAttachInfo(attach);
+		if (!Boolean.TRUE.equals(saved)) {
+			log.error("附件信息保存失败，报告文件:"+fileName);
+		}
+		return bladeFile;
+	}
+
+	private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType) {
+		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.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 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