From 12f2fafc574afb4c534ab59244f2b954d1876e9f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:37:20 +0800
Subject: [PATCH] 解决回传工控网记录无法撤销的问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java
index a37e995..a8c74b5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java
@@ -16,12 +16,16 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.UrlUtil;
+import org.springblade.mdm.commons.service.OssFileCommonService;
+import org.springblade.mdm.machinefile.entity.FileSendRecord;
+import org.springblade.mdm.machinefile.entity.MachineAcceptedFile;
import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springblade.mdm.machinefile.service.MachineAcceptedFileService;
import org.springblade.mdm.machinefile.service.NcProgramExportInnerService;
import org.springblade.mdm.machinefile.vo.MachineBackFileHandleExcelVO;
import org.springblade.mdm.machinefile.vo.MachineAcceptedFileHandleQueryVO;
import org.springblade.mdm.machinefile.vo.MachineAcceptedFileVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -34,9 +38,8 @@
@RequestMapping("/machinefile/filehandle")
@Tag(name = "鏈哄簥鍥炰紶绋嬪簭澶勭悊", description = "鏈哄簥鍥炰紶绋嬪簭澶勭悊")
public class MachineAcceptedFileHandleController {
-
+ private final OssFileCommonService ossFileCommonService;
private final MachineAcceptedFileService acceptedFileService;
- private final MachineFileService machineFileService;
private final NcProgramExportInnerService ncProgramExportInnerService;
/**
* 鍒嗛〉
@@ -48,17 +51,23 @@
return R.data(pages);
}
+ @GetMapping("/download-by-id")
+ @Operation(summary = "涓嬪彂鏂囦欢璁板綍鍒楄〃", description = "涓嬪彂鏂囦欢璁板綍鍒楄〃")
+ public void downloadByRecordId(Long id,HttpServletResponse response) throws IOException {
+ MachineAcceptedFile acceptedFile = acceptedFileService.getById(id);
+ ossFileCommonService.download(acceptedFile.getOssName(),acceptedFile.getName(),response);
+ }
+
@GetMapping("export-to-inner")
@ApiOperationSupport(order = 13)
@Operation(summary = "瀵煎嚭鍒版秹瀵嗙綉", description = "瀵煎嚭鍒版秹瀵嗙綉")
- public void exportToInner(@Parameter(description = "瀹℃壒琛╥d鏁扮粍") String ids, HttpServletResponse response) {
+ public void exportToInner(@Parameter(description = "鏈哄簥鎺ユ敹鏂囦欢id鏁扮粍") String ids, HttpServletResponse response) {
if(Func.isBlank(ids)) {
throw new ServiceException("鏈�夋嫨鏂囦欢瀵煎嚭");
}
try {
String prefix = UrlUtil.encode(AuthUtil.getNickName()+"-宸ユ帶缃戝鍑�");
- //String filename =AuthUtil.getNickName()+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
String filename = prefix+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
response.setHeader("Content-Disposition", "attachment; filename="+filename);
@@ -104,7 +113,7 @@
txt = "鍥哄寲";
break;
case 3:
- txt = "鍋忕";
+ txt = "涓存椂鏇存敼鍗�";
break;
default:
txt = "鏈煡";
--
Gitblit v1.9.3