From 10158625f1096c54664a5f87b3f32d33794e4eee Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期五, 11 九月 2026 12:13:59 +0800
Subject: [PATCH] fix(mdm): 物料导入“状态”列兼容中文，读表异常改为友好提示
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 8 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
index 87c4dd1..fded63a 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java
@@ -1,23 +1,38 @@
package cn.iocoder.yudao.module.mdm.controller.admin.unit;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
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.mdm.controller.admin.unit.vo.MdmUnitMeasureExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportExcelVO;
+import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureImportRespVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasurePageReqVO;
import cn.iocoder.yudao.module.mdm.controller.admin.unit.vo.MdmUnitMeasureSaveReqVO;
import cn.iocoder.yudao.module.mdm.dal.dataobject.unit.MdmUnitMeasureDO;
import cn.iocoder.yudao.module.mdm.service.unit.MdmUnitMeasureService;
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;
import jakarta.validation.Valid;
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.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "绠＄悊鍚庡彴 - MDM 璁￠噺鍗曚綅")
@@ -31,14 +46,14 @@
@PostMapping("/create")
@Operation(summary = "鍒涘缓璁￠噺鍗曚綅")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:create')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:create')")
public CommonResult<Long> createUnitMeasure(@Valid @RequestBody MdmUnitMeasureSaveReqVO createReqVO) {
return success(unitMeasureService.createUnitMeasure(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊璁￠噺鍗曚綅")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:update')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:update')")
public CommonResult<Boolean> updateUnitMeasure(@Valid @RequestBody MdmUnitMeasureSaveReqVO updateReqVO) {
unitMeasureService.updateUnitMeasure(updateReqVO);
return success(true);
@@ -48,7 +63,7 @@
@Operation(summary = "鏇存柊璁￠噺鍗曚綅鐘舵��")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
@Parameter(name = "status", description = "鐘舵��", required = true, example = "0")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:update')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:update')")
public CommonResult<Boolean> updateUnitMeasureStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
unitMeasureService.updateUnitMeasureStatus(id, status);
return success(true);
@@ -57,7 +72,7 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁￠噺鍗曚綅")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:delete')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:delete')")
public CommonResult<Boolean> deleteUnitMeasure(@RequestParam("id") Long id) {
unitMeasureService.deleteUnitMeasure(id);
return success(true);
@@ -66,21 +81,21 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:query')")
public CommonResult<MdmUnitMeasureDO> getUnitMeasure(@RequestParam("id") Long id) {
return success(unitMeasureService.getUnitMeasure(id));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:query')")
public CommonResult<PageResult<MdmUnitMeasureDO>> getUnitMeasurePage(@Valid MdmUnitMeasurePageReqVO pageReqVO) {
return success(unitMeasureService.getUnitMeasurePage(pageReqVO));
}
@GetMapping("/list")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:query')")
public CommonResult<List<MdmUnitMeasureDO>> getUnitMeasureList() {
return success(unitMeasureService.getUnitMeasureList(null));
}
@@ -88,9 +103,61 @@
@GetMapping("/list-by-ids")
@Operation(summary = "鑾峰緱璁￠噺鍗曚綅鍒楄〃")
@Parameter(name = "ids", description = "缂栧彿鍒楄〃", required = true, example = "1,2,3")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:query')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:query')")
public CommonResult<List<MdmUnitMeasureDO>> getUnitMeasureListByIds(@RequestParam("ids") List<Long> ids) {
return success(unitMeasureService.getUnitMeasureList(ids));
}
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭璁￠噺鍗曚綅 Excel")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportUnitMeasureExcel(@Valid MdmUnitMeasurePageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<MdmUnitMeasureDO> list = unitMeasureService.getUnitMeasurePage(pageReqVO).getList();
+ // 涓诲崟浣嶇紪鐮佹槧灏勶細涓�娆℃煡璇㈠叏閮ㄨ閲忓崟浣嶏紝鐢ㄤ簬瑙ｆ瀽 primaryId -> 缂栫爜
+ MdmUnitMeasurePageReqVO allReqVO = new MdmUnitMeasurePageReqVO();
+ allReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ Map<Long, String> unitCodeMap = new HashMap<>();
+ for (MdmUnitMeasureDO unit : unitMeasureService.getUnitMeasurePage(allReqVO).getList()) {
+ unitCodeMap.put(unit.getId(), unit.getCode());
+ }
+ // 缁勮瀵煎嚭 VO锛堜富鍗曚綅缂栫爜浠� DO.primaryId 瑙ｆ瀽锛�
+ List<MdmUnitMeasureExcelVO> excelList = new ArrayList<>();
+ for (MdmUnitMeasureDO unit : list) {
+ MdmUnitMeasureExcelVO excelVO = BeanUtils.toBean(unit, MdmUnitMeasureExcelVO.class);
+ if (unit.getPrimaryId() != null) {
+ excelVO.setPrimaryCode(unitCodeMap.get(unit.getPrimaryId()));
+ }
+ excelList.add(excelVO);
+ }
+ // 瀵煎嚭 Excel
+ ExcelUtils.write(response, "璁￠噺鍗曚綅鏁版嵁.xls", "璁￠噺鍗曚綅", MdmUnitMeasureExcelVO.class, excelList);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆璁￠噺鍗曚綅妯℃澘")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<MdmUnitMeasureImportExcelVO> list = Arrays.asList(
+ MdmUnitMeasureImportExcelVO.builder().code("PC").name("鐗�").primaryFlag(true).changeRate(new java.math.BigDecimal("1")).status(0).remark("绀轰緥锛氫富鍗曚綅").build(),
+ MdmUnitMeasureImportExcelVO.builder().code("XIA").name("绠�").primaryFlag(false).primaryCode("PC").changeRate(new java.math.BigDecimal("100")).status(0).remark("绀轰緥锛�1绠�=100鐗�").build()
+ );
+ ExcelUtils.write(response, "璁￠噺鍗曚綅瀵煎叆妯℃澘.xls", "璁￠噺鍗曚綅", MdmUnitMeasureImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆璁￠噺鍗曚綅")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mdm:unit:import')")
+ public CommonResult<MdmUnitMeasureImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MdmUnitMeasureImportExcelVO> list = ExcelUtils.read(file, MdmUnitMeasureImportExcelVO.class);
+ return success(unitMeasureService.importUnitMeasureList(list, updateSupport));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3