From 8ab608ce1b8425fe13b0766024554031f23289dc Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 16:34:32 +0800
Subject: [PATCH] 固化流程，结束是移动节点
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/machine/controller/MachineController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 a1bdd72..34c1a5e 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
@@ -24,10 +24,12 @@
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.mdm.program.vo.MdmProgramImportVO;
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 org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.List;
@@ -46,10 +48,14 @@
* 鏂板
*/
@PostMapping("/save")
- @Operation(summary = "鏂板", description = "鏈哄簥缁勪俊鎭�")
+ @Operation(summary = "鏂板", description = "鏈哄簥淇℃伅")
public R<Boolean> save(@RequestBody MachineSaveVO vo) {
-
- service.saveMachine(vo);
+ try {
+ service.saveMachine(vo);
+ }catch (Exception e) {
+ log.error("鏂板鏈哄簥澶辫触", e);;
+ return R.fail(e.getMessage());
+ }
return R.<Boolean>status(true);
}
@@ -59,7 +65,6 @@
@Operation(summary = "淇敼", description = "鏈哄簥淇℃伅")
@PostMapping("/update")
public R<Boolean> update(@RequestBody MachineSaveVO vo) {
-
return R.<Boolean>status(service.updateMachine(vo));
}
@@ -69,6 +74,17 @@
return R.data(service.detail(id));
}
+ @PostMapping("import")
+ @ApiOperationSupport(order = 1)
+ @Operation(summary = "鏈哄簥瀵煎叆", description = "鏈哄簥瀵煎叆锛屽叏閮ㄦ垚鍔熻繑鍥炵┖涓诧紝閮ㄥ垎鎴愬姛杩斿洖鍏蜂綋淇℃伅")
+ public R<String> importMachines(@RequestParam MultipartFile file) {
+ try {
+ return R.data(service.importMachines(file));
+ }catch (Exception e){
+ log.error("瀵煎叆閿欒",e);
+ return R.fail(e.getMessage());
+ }
+ }
/**
* 鍒犻櫎
*/
@@ -97,7 +113,7 @@
@GetMapping("export")
@ApiOperationSupport(order = 13)
@Operation(summary = "瀵煎嚭鏈哄簥", description = "鍚嶇О鎴栫紪鐮�")
- public void exportUser(MachineQueryVO query, HttpServletResponse response) {
+ public void export(MachineQueryVO query, HttpServletResponse response) {
query.setCurrent(1);
query.setSize(Integer.MAX_VALUE);
IPage<MachineVO> pages = service.pageQuery(query);
@@ -109,7 +125,7 @@
list.add(excelVO);
});
- ExcelUtil.export(response, "鏈哄簥鏁版嵁" + DateUtil.time(), "鐢ㄦ埛鏁版嵁琛�", list, MachineExcelVO.class);
+ ExcelUtil.export(response, "鏈哄簥鏁版嵁" + DateUtil.time(), "鏈哄簥鏁版嵁琛�", list, MachineExcelVO.class);
}
@Operation(summary = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�", description = "浜х敓鏈哄簥鍥炰紶缁撴瀯鏍�")
--
Gitblit v1.9.3