From 7551b1ae51da67627f7ed03276707127dfc9cdc6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 17 七月 2025 17:29:49 +0800
Subject: [PATCH] 机床回传文件调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileHandleController.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileHandleController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileHandleController.java
index cdde887..9764f3a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileHandleController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileHandleController.java
@@ -3,10 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
@@ -14,7 +17,9 @@
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.machineback.service.MachineBackFileService;
+import org.springblade.mdm.machineback.service.NcProgramExportInnerService;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
@@ -23,19 +28,19 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("/machineback/filehandle")
-@Tag(name = "鏈哄簥鍥炰紶鏂囦欢澶勭悊", description = "鏈哄簥鍥炰紶鏂囦欢澶勭悊")
+@Tag(name = "鏈哄簥鍥炰紶绋嬪簭澶勭悊", description = "鏈哄簥鍥炰紶绋嬪簭澶勭悊")
public class MachineBackFileHandleController {
- @Autowired
- private MachineBackFileService service;
-
-
+ private final MachineBackFileService service;
+ private final NcProgramExportInnerService ncProgramExportInnerService;
/**
* 鍒嗛〉
*/
@@ -49,8 +54,20 @@
@GetMapping("export-to-inner")
@ApiOperationSupport(order = 13)
@Operation(summary = "瀵煎嚭鍒版秹瀵嗙綉", description = "瀵煎嚭鍒版秹瀵嗙綉")
- public void exportToInner(MachineBackFileHandleQueryVO query, HttpServletResponse response) {
+ public void exportToInner(@RequestBody @Parameter(description = "瀹℃壒琛╥d鏁扮粍") IdsVO vo, HttpServletResponse response) {
+ if(vo.getIds() == null || vo.getIds().length == 0) {
+ throw new ServiceException("鏈�夋嫨鏂囦欢瀵煎嚭");
+ }
+ try {
+ String filename = "toinnerexp-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
+ response.setHeader("Content-Disposition", "attachment; filename="+filename);
+ response.setContentType("application/octet-stream");
+ ncProgramExportInnerService.exportToInner(vo.getIds(),response.getOutputStream());
+ } catch (IOException e) {
+ log.error("宸ユ帶缃戝鍑哄洖浼犳枃浠跺紓甯�", e);
+ throw new RuntimeException(e);
+ }
}
@@ -63,11 +80,13 @@
List<MachineBackFileHandleExcelVO> list = new ArrayList<>();
pages.getRecords().forEach(vo ->{
- MachineBackFileHandleExcelVO excelVO = new MachineBackFileHandleExcelVO();
+ MachineBackFileHandleExcelVO excelVO = new MachineBackFileHandleExcelVO();
+ BeanUtil.copyProperties(vo, excelVO);
excelVO.setCuredStatus(vo.getIsCured()==0?"鍥哄寲":"鏈浐鍖�");
- BeanUtil.copy(vo, excelVO);
+
+ list.add(excelVO);
});
- ExcelUtil.export(response, "鏈哄簥鍥炰紶鏂囦欢澶勭悊" + DateUtil.time(), "鏈哄簥鍥炰紶鏂囦欢琛�", list, MachineBackFileHandleExcelVO.class);
+ ExcelUtil.export(response, "鏈哄簥鍥炰紶绋嬪簭" + DateUtil.time(), "鏈哄簥鍥炰紶绋嬪簭琛�", list, MachineBackFileHandleExcelVO.class);
}
}
--
Gitblit v1.9.3