From f2d89e470636e90a81a6ee446e8349c5037f7eb9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 24 六月 2025 13:09:00 +0800
Subject: [PATCH] 机床回传文件增加excel导出

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java |   29 ++++++++++++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/vo/MachineBackFileExcelVO.java            |   33 ++++++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
index 1e5de83..5c96e08 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
@@ -3,17 +3,26 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.mdm.basesetting.machine.MachineService;
+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.machineback.service.MachineBackFileService;
+import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
 import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
 import org.springblade.mdm.machineback.vo.MachineBackFileVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -59,4 +68,24 @@
 		IPage<MachineBackFileVO> pages = service.pageQuery(query);
 		return R.data(pages);
 	}
+
+	/**
+	 * 鍒嗛〉
+	 */
+	@Operation(summary = "瀵煎嚭Excel", description = "瀵煎嚭Excel")
+	@GetMapping("/export-excel")
+	public void exportExcel(MachineBackFileQueryVO query, HttpServletResponse response) {
+		query.setCurrent(1);
+		query.setSize(Integer.MAX_VALUE);
+
+		IPage<MachineBackFileVO> pages = service.pageQuery(query);
+		List<MachineBackFileExcelVO> list = new ArrayList<>();
+		pages.getRecords().forEach(m ->{
+			MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();
+			BeanUtils.copyProperties(m, excelVO);
+			excelVO.setCureStatus(m.getIsCured()==1?"宸插浐鍖�":"鏈浐鍖�");
+			list.add(excelVO);
+		});
+		ExcelUtil.export(response, "鏈哄簥鍥炰紶鏂囦欢" + DateUtil.time(), "鏈哄簥鍥炰紶鏂囦欢琛�", list, MachineBackFileExcelVO.class);
+	}
 }
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/vo/MachineBackFileExcelVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/vo/MachineBackFileExcelVO.java
new file mode 100644
index 0000000..22ee525
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/vo/MachineBackFileExcelVO.java
@@ -0,0 +1,33 @@
+package org.springblade.mdm.machineback.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.mdm.commons.vo.BaseVO;
+
+import java.util.Date;
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+@Setter
+@Getter
+public class MachineBackFileExcelVO extends BaseVO {
+
+	@ExcelProperty("鏂囦欢鍚嶇О")
+	private String name;
+	@ExcelProperty("鍥炰紶鏈哄簥")
+	private String machineCode;
+	@ExcelProperty("绋嬪簭鍚嶇О")
+	private String programName;
+
+	@ExcelProperty("鍥哄寲鐘舵��")
+	private String cureStatus;
+	@ExcelProperty("鏂囦欢鍒拌揪鏃堕棿")
+	private Date arrivedTime;
+}

--
Gitblit v1.9.3