From f4a412cebe9532833320bad81cc92e7930d7715a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 03 九月 2026 17:27:06 +0800
Subject: [PATCH] feat(mes): 优化MES模块功能与配置
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 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 072e4d0..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,9 +1,12 @@
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;
@@ -23,9 +26,13 @@
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 璁￠噺鍗曚綅")
@@ -39,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);
@@ -56,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);
@@ -65,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);
@@ -74,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));
}
@@ -96,13 +103,42 @@
@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(),
@@ -117,7 +153,7 @@
@Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
@Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
})
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:import')")
+ @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);
--
Gitblit v1.9.3