From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java
index 4249db1..109c5ac 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java
@@ -7,6 +7,8 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.process.vo.MesProProcessSaveReqVO;
@@ -14,6 +16,7 @@
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -21,8 +24,10 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.Collections;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -65,7 +70,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇宸ュ簭")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-process:query')")
public CommonResult<MesProProcessRespVO> getProcess(@RequestParam("id") Long id) {
MesProProcessDO process = processService.getProcess(id);
return success(BeanUtils.toBean(process, MesProProcessRespVO.class));
@@ -73,7 +77,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇宸ュ簭鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-process:query')")
public CommonResult<PageResult<MesProProcessRespVO>> getProcessPage(@Valid MesProProcessPageReqVO pageReqVO) {
PageResult<MesProProcessDO> pageResult = processService.getProcessPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesProProcessRespVO.class));
@@ -100,4 +103,31 @@
ExcelUtils.write(response, "鐢熶骇宸ュ簭.xls", "鏁版嵁", MesProProcessRespVO.class, data);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鐢熶骇宸ュ簭瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesProProcessImportExcelVO> list = Collections.singletonList(
+ MesProProcessImportExcelVO.builder()
+ .code("PROCESS001").name("绀轰緥宸ュ簭").type(1).attention("")
+ .status(0).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鐢熶骇宸ュ簭瀵煎叆妯℃澘.xls", "鐢熶骇宸ュ簭鍒楄〃", MesProProcessImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鐢熶骇宸ュ簭")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:pro-process:import')")
+ public CommonResult<MesProProcessImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesProProcessImportExcelVO> list = ExcelUtils.read(file, MesProProcessImportExcelVO.class);
+ return success(processService.importProcessList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3