From 847a7773ef1a8ad418c6934d35b5f205a97c04d0 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 06 十二月 2025 17:03:24 +0800
Subject: [PATCH] fix:在任务状态更新时，需要更新日志到旧系统
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskAttachmentController.java | 136 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 130 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskAttachmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskAttachmentController.java
index b12fa9e..d9545fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskAttachmentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysTaskAttachmentController.java
@@ -1,9 +1,21 @@
package com.ruoyi.web.controller.task;
+import java.util.Date;
import java.util.List;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.OutputStream;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.WechatUtils;
+import com.ruoyi.common.config.WechatConfig;
import com.ruoyi.system.domain.SysTask;
+import com.ruoyi.system.domain.SysTaskEmergency;
+import com.ruoyi.system.service.ISysTaskEmergencyService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.ITaskAttachmentSyncService;
+import com.ruoyi.system.service.IWechatAccessTokenService;
+import com.ruoyi.system.task.ITaskAttachmentService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -34,10 +46,29 @@
@Autowired
private ISysTaskService sysTaskService;
+ @Autowired
+ private ISysUserService sysUserService;
+
+ @Autowired
+ private ITaskAttachmentSyncService taskAttachmentSyncService;
+
+ @Autowired
+ private ITaskAttachmentService taskAttachmentService;
+
+ @Autowired
+ private WechatConfig wechatConfig;
+
+ @Autowired
+ private ISysTaskEmergencyService sysTaskEmergencyService;
+
+ @Autowired
+ private ISysUserService userService;
+
+ @Autowired
+ private IWechatAccessTokenService wechatAccessTokenService;
/**
* 鏌ヨ浠诲姟闄勪欢鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('task:general:query')")
@GetMapping("/list/{taskId}")
public AjaxResult list(@PathVariable("taskId") Long taskId) {
SysTask task = sysTaskService.getTaskDetail(taskId);
@@ -47,13 +78,17 @@
/**
* 涓婁紶浠诲姟闄勪欢
*/
- @PreAuthorize("@ss.hasPermi('task:general:edit')")
+
@Log(title = "浠诲姟闄勪欢", businessType = BusinessType.INSERT)
@PostMapping("/upload/{taskId}")
- public AjaxResult upload(@PathVariable("taskId") Long taskId, @RequestParam("file") MultipartFile file) {
+ public AjaxResult upload(@PathVariable("taskId") Long taskId,
+ @RequestParam("file") MultipartFile file,
+ @RequestParam(value = "category", required = true) String category) {
try {
- int result = sysTaskService.uploadAttachment(taskId, file);
- if (result > 0) {
+ Long attachmentId= sysTaskService.uploadAttachment(taskId, file, category);
+ if (attachmentId > 0) {
+ //鍦ㄨ繖閲岃繘琛屽悓姝�
+ SyncAttachmentToImageData(taskId,sysTaskService.getTaskDetail(taskId).getCreatorId(),attachmentId);
return success("涓婁紶鎴愬姛");
} else {
return error("涓婁紶澶辫触");
@@ -63,10 +98,30 @@
}
}
+ private void SyncAttachmentToImageData(Long taskId,Long taskCreatorId, Long attachmentId) {
+ Integer oaUserId= sysUserService.selectUserById(taskCreatorId).getOaUserId();
+ SysTaskEmergency taskEmergency= sysTaskEmergencyService.selectSysTaskEmergencyByTaskId(taskId);
+ if(taskEmergency!=null ){
+ Long serviceOrderId= taskEmergency.getLegacyServiceOrdId();
+ Long dispathOrdId=taskEmergency.getLegacyDispatchOrdId();
+
+ if(serviceOrderId!=null && dispathOrdId!=null){
+ SysTaskAttachment attachment=sysTaskService.getAttachmentById(attachmentId);
+ Long imageDataId= taskAttachmentSyncService.syncAttachmentToImageData(attachment, serviceOrderId, dispathOrdId,oaUserId);
+ //鍚屾鎴愬姛
+ if(imageDataId>0){
+ attachment.setSyncedToImageData(1);
+ attachment.setSyncTime(new Date());
+ attachment.setImageDataId(imageDataId);
+ taskAttachmentService.updateAttachment(attachment);
+ }
+
+ }
+ }
+ }
/**
* 鍒犻櫎浠诲姟闄勪欢
*/
- @PreAuthorize("@ss.hasPermi('task:general:edit')")
@Log(title = "浠诲姟闄勪欢", businessType = BusinessType.DELETE)
@DeleteMapping("/{attachmentId}")
public AjaxResult remove(@PathVariable("attachmentId") Long attachmentId) {
@@ -81,4 +136,73 @@
return error("鍒犻櫎澶辫触锛�" + e.getMessage());
}
}
+
+ /**
+ * 浠庡井淇ediaId涓婁紶闄勪欢锛堝井淇″皬绋嬪簭涓撶敤锛�
+ * 浣跨敤搴旂敤绾х紦瀛樼殑AccessToken
+ */
+ @Log(title = "浠诲姟闄勪欢", businessType = BusinessType.INSERT)
+ @PostMapping("/uploadFromWechat/{taskId}")
+ public AjaxResult uploadFromWechat(@PathVariable("taskId") Long taskId,
+ @RequestParam("mediaId") String mediaId,
+ @RequestParam(value = "category", required = false) String category) {
+ try {
+ // 鑾峰彇寰俊AccessToken锛堜娇鐢ㄥ簲鐢ㄧ骇缂撳瓨锛�
+ String accessToken = wechatAccessTokenService.getAppAccessToken();
+ if (accessToken == null || accessToken.isEmpty()) {
+ return error("鑾峰彇寰俊AccessToken澶辫触");
+ }
+
+ // 閫氳繃mediaId涓婁紶闄勪欢
+ Long attachmentId = sysTaskService.uploadAttachmentFromWechat(taskId, accessToken, mediaId, category);
+ SysTask task=sysTaskService.getTaskDetail(taskId);
+ if (attachmentId > 0) {
+ this.SyncAttachmentToImageData(taskId,task.getCreatorId(),attachmentId);
+ return success("涓婁紶鎴愬姛");
+ } else {
+ return error("涓婁紶澶辫触");
+ }
+ } catch (Exception e) {
+ return error("涓婁紶澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ /**
+ * 涓嬭浇闄勪欢
+ */
+ @GetMapping("/download/{attachmentId}")
+ public void downloadAttachment(@PathVariable("attachmentId") Long attachmentId, HttpServletResponse response) {
+ try {
+ SysTaskAttachment attachment = sysTaskService.getAttachmentById(attachmentId);
+ if (attachment == null) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ return;
+ }
+
+ File file = new File(attachment.getFilePath());
+ if (!file.exists()) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ return;
+ }
+
+ // 璁剧疆鍝嶅簲澶�
+ response.setContentType("application/octet-stream");
+ response.setHeader("Content-Disposition", "attachment; filename=" + attachment.getFileName());
+ response.setContentLengthLong(file.length());
+
+ // 璇诲彇鏂囦欢骞惰緭鍑�
+ try (FileInputStream fis = new FileInputStream(file);
+ OutputStream os = response.getOutputStream()) {
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+ while ((bytesRead = fis.read(buffer)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ os.flush();
+ }
+ } catch (Exception e) {
+ logger.error("涓嬭浇闄勪欢澶辫触", e);
+ response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+ }
+ }
}
--
Gitblit v1.9.1