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/pd/processparam/MesPdProcessParamController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparam/MesPdProcessParamController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparam/MesPdProcessParamController.java
index cd9770b..f02bd2f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparam/MesPdProcessParamController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/processparam/MesPdProcessParamController.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.pd.processparam.vo.MesPdProcessParamImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.processparam.vo.MesPdProcessParamSaveReqVO;
@@ -17,6 +19,7 @@
import cn.iocoder.yudao.module.mes.service.pd.processparam.MesPdProcessParamService;
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;
@@ -24,6 +27,7 @@
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;
@@ -73,7 +77,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱宸ヨ壓鍙傛暟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pd-process-param:query')")
public CommonResult<MesPdProcessParamRespVO> getProcessParam(@RequestParam("id") Long id) {
MesPdProcessParamDO processParam = processParamService.getProcessParam(id);
if (processParam == null) {
@@ -84,7 +87,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱宸ヨ壓鍙傛暟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pd-process-param:query')")
public CommonResult<PageResult<MesPdProcessParamRespVO>> getProcessParamPage(@Valid MesPdProcessParamPageReqVO pageReqVO) {
PageResult<MesPdProcessParamDO> pageResult = processParamService.getProcessParamPage(pageReqVO);
return success(new PageResult<>(buildProcessParamRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -103,6 +105,33 @@
buildProcessParamRespVOList(list));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱宸ヨ壓鍙傛暟瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesPdProcessParamImportExcelVO> list = Collections.singletonList(
+ MesPdProcessParamImportExcelVO.builder()
+ .paramName("绀轰緥鍙傛暟").paramType(1).unitMeasureName("")
+ .required(false).remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "宸ヨ壓鍙傛暟瀵煎叆妯℃澘.xls", "宸ヨ壓鍙傛暟鍒楄〃", MesPdProcessParamImportExcelVO.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:pd-process-param:import')")
+ public CommonResult<MesPdProcessParamImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesPdProcessParamImportExcelVO> list = ExcelUtils.read(file, MesPdProcessParamImportExcelVO.class);
+ return success(processParamService.importProcessParamList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesPdProcessParamRespVO> buildProcessParamRespVOList(List<MesPdProcessParamDO> list) {
--
Gitblit v1.9.3