From 15de9d8c750fc2561285f09f415f0e361bd3a57d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 19:35:16 +0800
Subject: [PATCH] 修复重复派工验证错误
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
index e73a455..1962ee3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java
@@ -6,7 +6,9 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
@@ -17,11 +19,13 @@
import org.springblade.mdm.basesetting.machine.vo.MachineSaveVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
+import org.springblade.mdm.commons.service.ParamService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -35,6 +39,10 @@
private MachineService service;
@Autowired
private MachineImportService machineImportService;
+ @Autowired
+ private ParamService paramService;
+ @Autowired
+ private OssTemplate ossTemplate;
/**
* 鏂板
*/
@@ -119,6 +127,25 @@
ExcelUtil.export(response, "鏈哄簥鏁版嵁" + DateUtil.time(), "鏈哄簥鏁版嵁琛�", list, MachineExcel.class);
}
+ @Operation(summary = "涓嬭浇鏈哄簥瀵煎叆妯℃澘", description = "涓嬭浇鏈哄簥瀵煎叆妯℃澘")
+ @GetMapping("/download-template")
+ public void downloadTemplate(HttpServletResponse response) {
+ String PARAMKEY = "MACHINE_TEMPLATE";
+
+ try {
+ String filename = "machinetemplate.xlsx";
+ response.setHeader("Content-Disposition", "attachment; filename="+filename);
+ response.setContentType("application/octet-stream");
+ String ossName = paramService.getParamValue(PARAMKEY,"");
+ try(InputStream ins = ossTemplate.statFileStream(ossName);){
+ IOUtils.copy(ins,response.getOutputStream());
+ }
+
+ } catch (Exception e) {
+ log.error("瀵煎嚭鍒嗘満搴婃ā鏉垮紓甯�", e);
+ }
+ }
+
@Operation(summary = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�", description = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�")
@PostMapping("/gen-fileback-dirs")
public R<Void> genFileBackDirs(@RequestParam Long id) {
--
Gitblit v1.9.3