From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 98a3086..b6a0dcf 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,17 @@
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.springblade.mdm.program.service.programannotation.AnnotationUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -34,7 +39,7 @@
@RequestMapping("/machinefile/filehandle")
@Tag(name = "鏈哄簥鍥炰紶绋嬪簭澶勭悊", description = "鏈哄簥鍥炰紶绋嬪簭澶勭悊")
public class MachineAcceptedFileHandleController {
-
+ private final OssFileCommonService ossFileCommonService;
private final MachineAcceptedFileService acceptedFileService;
private final NcProgramExportInnerService ncProgramExportInnerService;
/**
@@ -45,6 +50,13 @@
public R<IPage<MachineAcceptedFileVO>> page(MachineAcceptedFileHandleQueryVO query) {
IPage<MachineAcceptedFileVO> pages = acceptedFileService.handlePageQuery(query);
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")
@@ -88,25 +100,20 @@
ExcelUtil.export(response, "鏈哄簥鍥炰紶绋嬪簭" + DateUtil.time(), "鏈哄簥鍥炰紶绋嬪簭琛�", list, MachineBackFileHandleExcelVO.class);
}
- String parseProgramStatusName(Integer programStatus){
+ /**
+ * 杞崲鐘舵�佷负鏄剧ず鏂囨湰
+ * @param programStatus 绋嬪簭鐘舵�佺紪鐮�
+ * @return 鐘舵�佸悕绉�
+ */
+ String parseProgramStatusName(String programStatus){
if(programStatus == null){
return "鏈煡";
}
- String txt;
-
- switch(programStatus){
- case 1:
- txt = "璇曞垏";
- break;
- case 2:
- txt = "鍥哄寲";
- break;
- case 3:
- txt = "鍋忕";
- break;
- default:
- txt = "鏈煡";
- }
- return txt;
+ return switch (programStatus) {
+ case AnnotationUtil.SQ -> "璇曞垏";
+ case AnnotationUtil.GH -> "鍥哄寲";
+ case AnnotationUtil.LG -> "涓存椂鏇存敼鍗�";
+ default -> "鏈煡";
+ };
}
}
--
Gitblit v1.9.3