From 6e3d8e950e7dec3551bee3512673e1fc2d384d2b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 18 十月 2026 20:25:55 +0800
Subject: [PATCH] fix(mes): 修复能耗抄表控制器启动时的 bean 名称冲突
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
index 332d12d..f63f2aa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
@@ -35,6 +35,10 @@
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import org.springframework.web.multipart.MultipartFile;
+import io.swagger.v3.oas.annotations.Parameters;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck.vo.MesDvMeteringCheckImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck.vo.MesDvMeteringCheckImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 璁￠噺妫�娴嬭褰�")
@RestController
@@ -127,4 +131,36 @@
});
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱璁￠噺妫�娴嬭褰曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesDvMeteringCheckImportExcelVO> list = Collections.singletonList(
+ MesDvMeteringCheckImportExcelVO.builder()
+ .checkCode("CK-001").meteringCode("MD-001")
+ .checkDate(java.time.LocalDate.of(2026, 12, 31))
+ .checkOrg("甯傝閲忛櫌").checkResult(1).certNo("")
+ .checkUserId(1L).nextCheckDate(java.time.LocalDate.of(2027, 12, 31))
+ .remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "璁￠噺妫�娴嬭褰曞鍏ユā鏉�.xls", "璁￠噺妫�娴嬭褰曞垪琛�", MesDvMeteringCheckImportExcelVO.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:dv-metering-check:import')")
+ public CommonResult<MesDvMeteringCheckImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesDvMeteringCheckImportExcelVO> list = ExcelUtils.read(file, MesDvMeteringCheckImportExcelVO.class);
+ return success(meteringCheckService.importMeteringCheckList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3