From 7abf9f290c39dd20f865be53dbecee7fab6de140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 19:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

---
 yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
index af3973f..7d552bc 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
@@ -5,6 +5,9 @@
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigImportExcelVO;
+import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigImportReqVO;
+import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigImportRespVO;
 import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigPageReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigRespVO;
 import cn.iocoder.yudao.module.infra.controller.admin.config.vo.ConfigSaveReqVO;
@@ -23,6 +26,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -114,4 +118,25 @@
                 ConfigConvert.INSTANCE.convertList(list));
     }
 
+    @GetMapping("/get-import-template")
+    @Operation(summary = "鑾峰緱瀵煎叆鍙傛暟閰嶇疆妯℃澘")
+    public void importTemplate(HttpServletResponse response) throws IOException {
+        // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+        List<ConfigImportExcelVO> list = Arrays.asList(
+                ConfigImportExcelVO.builder().category("biz").name("绀轰緥鍙傛暟").configKey("example.key")
+                        .value("exampleValue").visible(true).remark("").build()
+        );
+        // 杈撳嚭
+        ExcelUtils.write(response, "鍙傛暟閰嶇疆瀵煎叆妯℃澘.xls", "鍙傛暟閰嶇疆鍒楄〃", ConfigImportExcelVO.class, list);
+    }
+
+    @PostMapping("/import")
+    @Operation(summary = "瀵煎叆鍙傛暟閰嶇疆")
+    @PreAuthorize("@ss.hasPermission('infra:config:import')")
+    public CommonResult<ConfigImportRespVO> importExcel(@Valid ConfigImportReqVO importReqVO)
+            throws Exception {
+        List<ConfigImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ConfigImportExcelVO.class);
+        return success(configService.importConfigList(list, importReqVO));
+    }
+
 }

--
Gitblit v1.9.3