From 295bf6f10ad0b668d2dbaa4525a15d6d52807ef1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 14:24:42 +0800
Subject: [PATCH] 导入工控网，附件改名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
index 5321f90..55ff76a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java
@@ -9,18 +9,20 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.UrlUtil;
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.service.NcProgramExportDNCService;
import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
import org.springframework.web.bind.annotation.*;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
/**
@@ -32,7 +34,7 @@
@RestController
@RequestMapping("/program/exchange")
@AllArgsConstructor
-@Tag(name = "瀵煎嚭DNC", description = "娑夊瘑缃戠▼搴忓鍑篋NC")
+@Tag(name = "瀵煎嚭宸ユ帶缃�", description = "娑夊瘑缃戠▼搴忓鍑虹粰宸ユ帶缃�")
@Slf4j
public class NcProgramExportDNCController {
@@ -42,23 +44,42 @@
@Operation(summary = "绋嬪簭瀵煎嚭DNC鍒嗛〉鏌ヨ", description = "鍒嗛〉鏌ヨ锛屼緵鐢ㄦ埛閫夋嫨鏁版嵁")
@GetMapping("/export-dnc-page")
public R<IPage<NcProgramExportDncPageVO>> page(NcProgramExportDncQueryVO query) {
- //IPage<NcProgramVO> pages = ncProgramService.pageQuery(query);
return R.data(ncProgramApprovedService.exportDncPageQuery(query));
}
@PostMapping("/export-dnc")
@Operation(summary = "鏁版帶绋嬪簭瀵煎嚭dnc", description = "鏁版帶绋嬪簭瀵煎嚭鍒板伐鎺х綉")
- public void exportDnc(@RequestBody @Parameter(description = "瀹℃壒琛╥d鏁扮粍") IdsVO vo, HttpServletResponse response) {
+ public void exportDnc(@RequestBody @Parameter(description = "瀹℃壒琛╥d鏁扮粍") IdsVO vo, HttpServletResponse response) throws IOException {
if(vo.getIds() == null || vo.getIds().length == 0) {
throw new ServiceException("鏈�夋嫨鏂囦欢瀵煎嚭");
}
- try {
- ncProgramExportDNCService.exportDnc(vo.getIds(),response.getOutputStream());
- } catch (IOException e) {
- log.error("瀵煎嚭DNC寮傚父", e);
- throw new RuntimeException(e);
- }
+ //try {
+ //瀵煎嚭鏂囦欢鍚嶇О瑕佹眰瀵煎嚭浜哄悕瀛�+鏃堕棿鎴�
+
+ String uname = UrlUtil.encode(AuthUtil.getNickName());
+ //String filename =AuthUtil.getNickName()+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
+ String filename = uname+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
+ response.setHeader("Content-Disposition", "attachment; filename="+filename);
+ response.setContentType("application/octet-stream;charset=utf-8");
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ncProgramExportDNCService.exportDnc(vo.getIds(),bos);
+ response.getOutputStream().write(bos.toByteArray());
+
+
+ //} catch (Exception e) {
+ //log.error("瀵煎嚭DNC寮傚父", e);
+ /*
+
+ throw new ResponseStatusException(
+ HttpStatus.NO_CONTENT,
+ "鍙傛暟鍙兘鍖呭惈瀛楁瘝",
+ new IllegalArgumentException("鏃犳晥鍙傛暟鏍煎紡")
+ );*/
+ //}
}
+
+
}
--
Gitblit v1.9.3