From 569df4daf76eb586f1add62707d0ffa2b7ff20f2 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 04 九月 2026 13:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/MdmUnitMeasureController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 2f5ec2c..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
@@ -46,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);
@@ -63,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);
@@ -72,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);
@@ -81,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));
}
@@ -103,14 +103,14 @@
@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-measure:export')")
+ @PreAuthorize("@ss.hasPermission('mdm:unit:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportUnitMeasureExcel(@Valid MdmUnitMeasurePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
@@ -138,7 +138,7 @@
@GetMapping("/get-import-template")
@Operation(summary = "鑾峰緱瀵煎叆璁￠噺鍗曚綅妯℃澘")
- @PreAuthorize("@ss.hasPermission('mdm:unit-measure:import')")
+ @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(),
@@ -153,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