From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
index 531ccb3..95ed2a6 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
@@ -38,6 +38,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.metering.vo.MesDvMeteringImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.metering.vo.MesDvMeteringImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 璁￠噺鍣ㄥ叿")
@RestController
@@ -79,7 +83,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:dv-metering:query')")
public CommonResult<MesDvMeteringRespVO> getMetering(@RequestParam("id") Long id) {
MesDvMeteringDO metering = meteringService.getMetering(id);
if (metering == null) {
@@ -90,7 +93,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:dv-metering:query')")
public CommonResult<PageResult<MesDvMeteringRespVO>> getMeteringPage(@Valid MesDvMeteringPageReqVO pageReqVO) {
PageResult<MesDvMeteringDO> pageResult = meteringService.getMeteringPage(pageReqVO);
return success(new PageResult<>(buildMeteringRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -110,7 +112,6 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
- @PreAuthorize("@ss.hasPermission('mes:dv-metering:query')")
public CommonResult<List<MesDvMeteringRespVO>> getMeteringSimpleList() {
List<MesDvMeteringDO> list = meteringService.getMeteringList();
return success(buildMeteringRespVOList(list));
@@ -142,4 +143,35 @@
});
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesDvMeteringImportExcelVO> list = Collections.singletonList(
+ MesDvMeteringImportExcelVO.builder()
+ .code("MD-001").name("鏁版樉鍗″昂").specification("0-150mm").brand("涓変赴")
+ .category(1).precision("0.01mm").range("0-150mm")
+ .checkCycleCount(12).useDate(java.time.LocalDate.of(2026, 1, 1))
+ .status(1).remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "璁￠噺鍣ㄥ叿瀵煎叆妯℃澘.xls", "璁￠噺鍣ㄥ叿鍒楄〃", MesDvMeteringImportExcelVO.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:import')")
+ public CommonResult<MesDvMeteringImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesDvMeteringImportExcelVO> list = ExcelUtils.read(file, MesDvMeteringImportExcelVO.class);
+ return success(meteringService.importMeteringList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3