From 4308b53ee6f9028905a333d86861ab2735ad2166 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 13 六月 2025 23:29:41 +0800
Subject: [PATCH] 补充机床接口

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 53 insertions(+), 3 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 a201526..a1bdd72 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
@@ -1,21 +1,37 @@
 package org.springblade.mdm.basesetting.machine.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+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.MachineSaveVO;
 import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.system.pojo.entity.User;
+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;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -40,11 +56,17 @@
 	/**
 	 * 淇敼
 	 */
-	@Operation(summary = "淇敼", description = "鏈哄簥缁勪俊鎭�")
+	@Operation(summary = "淇敼", description = "鏈哄簥淇℃伅")
 	@PostMapping("/update")
 	public R<Boolean> update(@RequestBody MachineSaveVO vo) {
 
 		return R.<Boolean>status(service.updateMachine(vo));
+	}
+
+	@Operation(summary = "璇︽儏", description = "鏌ヨ鏈哄簥璇︽儏")
+	@GetMapping("/detail")
+	public R<MachineVO> deatail(long id) {
+		return R.data(service.detail(id));
 	}
 
 	/**
@@ -68,9 +90,37 @@
 	@Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
 	@GetMapping("/page")
 	public R<IPage<MachineVO>> page(MachineQueryVO query) {
-
-
 		IPage<MachineVO> pages = service.pageQuery(query);
 		return R.data(pages);
 	}
+
+	@GetMapping("export")
+	@ApiOperationSupport(order = 13)
+	@Operation(summary = "瀵煎嚭鏈哄簥", description = "鍚嶇О鎴栫紪鐮�")
+	public void exportUser(MachineQueryVO query, HttpServletResponse response) {
+		query.setCurrent(1);
+		query.setSize(Integer.MAX_VALUE);
+		IPage<MachineVO> pages = service.pageQuery(query);
+
+		List<MachineExcelVO> list = new ArrayList<>();
+		pages.getRecords().forEach(m ->{
+			MachineExcelVO excelVO = new MachineExcelVO();
+			BeanUtils.copyProperties(m, excelVO);
+			list.add(excelVO);
+		});
+
+		ExcelUtil.export(response, "鏈哄簥鏁版嵁" + DateUtil.time(), "鐢ㄦ埛鏁版嵁琛�", list, MachineExcelVO.class);
+	}
+
+	@Operation(summary = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�", description = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�")
+	@PostMapping("/gen-fileback-dirs")
+	public R<Void> genFileBackDirs(@RequestParam Long id) {
+		try {
+			service.genMachineFileBackDirs(id);
+		} catch (Exception e) {
+			log.error("浜х敓鐩綍寮傚父",e);
+			return R.fail(e.getMessage());
+		}
+		return R.status(true);
+	}
 }

--
Gitblit v1.9.3