diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java index 1d628268..fed8dc52 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/quantityUnitRelation/QuantityUnitRelationController.java @@ -43,14 +43,14 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @PostMapping("/create") @Operation(summary = "创建计量单位量与单位关联") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:create')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:create')") public CommonResult createQuantityUnitRelation(@Valid @RequestBody QuantityUnitRelationSaveReqVO createReqVO) { return success(quantityUnitRelationService.createQuantityUnitRelation(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新计量单位量与单位关联") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:update')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:update')") public CommonResult updateQuantityUnitRelation(@Valid @RequestBody QuantityUnitRelationSaveReqVO updateReqVO) { quantityUnitRelationService.updateQuantityUnitRelation(updateReqVO); return success(true); @@ -59,7 +59,7 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @DeleteMapping("/delete") @Operation(summary = "删除计量单位量与单位关联") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:delete')") public CommonResult deleteQuantityUnitRelation(@RequestParam("id") Long id) { quantityUnitRelationService.deleteQuantityUnitRelation(id); return success(true); @@ -68,7 +68,7 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除计量单位量与单位关联") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:delete')") public CommonResult deleteQuantityUnitRelationList(@RequestBody BatchDeleteReqVO req) { quantityUnitRelationService.deleteQuantityUnitRelationListByIds(req.getIds()); return success(true); @@ -77,7 +77,7 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @GetMapping("/get") @Operation(summary = "获得计量单位量与单位关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:query')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:query')") public CommonResult getQuantityUnitRelation(@RequestParam("id") Long id) { QuantityUnitRelationDO quantityUnitRelation = quantityUnitRelationService.getQuantityUnitRelation(id); return success(BeanUtils.toBean(quantityUnitRelation, QuantityUnitRelationRespVO.class)); @@ -85,7 +85,7 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @GetMapping("/page") @Operation(summary = "获得计量单位量与单位关联分页") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:query')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:query')") public CommonResult> getQuantityUnitRelationPage(@Valid QuantityUnitRelationPageReqVO pageReqVO) { PageResult pageResult = quantityUnitRelationService.getQuantityUnitRelationPage(pageReqVO); return success(BeanUtils.toBean(pageResult, QuantityUnitRelationRespVO.class)); @@ -93,14 +93,14 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @GetMapping("/simple-page") @Operation(summary = "获得计量单位量与单位关联精简分页") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:query')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:query')") public CommonResult> getQuantityUnitRelationSimplePage(@Valid QuantityUnitRelationSimplePageReqVO pageReqVO) { return success(quantityUnitRelationService.getQuantityUnitRelationSimplePage(pageReqVO)); } @GetMapping("/export-excel") @Operation(summary = "导出计量单位量与单位关联 Excel") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:export')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:export')") @ApiAccessLog(operateType = EXPORT) public void exportQuantityUnitRelationExcel(@Valid QuantityUnitRelationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -113,7 +113,7 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @PostMapping("/batch-save") @Operation(summary = "批量保存计量单位量与单位关联") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:create')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:create')") public CommonResult batchSaveQuantityUnitRelations(@Valid @RequestBody QuantityUnitRelationBatchSaveReqVO batchSaveReqVO) { quantityUnitRelationService.batchSaveQuantityUnitRelations(batchSaveReqVO); return success(true); @@ -121,14 +121,14 @@ public class QuantityUnitRelationController implements BusinessControllerMarker @PostMapping("/create-unit-with-relation") @Operation(summary = "创建单位并关联到量纲(组合接口)") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:create')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:create')") public CommonResult createUnitWithRelation(@Valid @RequestBody CreateUnitWithRelationReqVO createReqVO) { return success(quantityUnitRelationService.createUnitWithRelation(createReqVO)); } @PostMapping("/delete-unit-with-relation") @Operation(summary = "删除单位及关联关系(组合接口)") - @PreAuthorize("@ss.hasPermission('unitmanagement:quantity-unit-relation:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:quantity-unit-relation:delete')") public CommonResult deleteUnitWithRelation(@Valid @RequestBody DeleteUnitWithRelationReqVO deleteReqVO) { quantityUnitRelationService.deleteUnitWithRelation(deleteReqVO); return success(true); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java index 22ca105b..e8b95217 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitConversion/UnitConversionController.java @@ -42,14 +42,14 @@ public class UnitConversionController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建单位转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:create')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:create')") public CommonResult createUnitConversion(@Valid @RequestBody UnitConversionSaveReqVO createReqVO) { return success(unitConversionService.createUnitConversion(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新单位转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:update')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:update')") public CommonResult updateUnitConversion(@Valid @RequestBody UnitConversionSaveReqVO updateReqVO) { unitConversionService.updateUnitConversion(updateReqVO); return success(true); @@ -58,7 +58,7 @@ public class UnitConversionController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除单位转换") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:delete')") public CommonResult deleteUnitConversion(@RequestParam("id") Long id) { unitConversionService.deleteUnitConversion(id); return success(true); @@ -67,7 +67,7 @@ public class UnitConversionController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除单位转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:delete')") public CommonResult deleteUnitConversionList(@RequestBody BatchDeleteReqVO req) { unitConversionService.deleteUnitConversionListByIds(req.getIds()); return success(true); @@ -76,7 +76,7 @@ public class UnitConversionController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得单位转换") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult getUnitConversion(@RequestParam("id") Long id) { UnitConversionDO unitConversion = unitConversionService.getUnitConversion(id); return success(BeanUtils.toBean(unitConversion, UnitConversionRespVO.class)); @@ -84,7 +84,7 @@ public class UnitConversionController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得单位转换分页") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult> getUnitConversionPage(@Valid UnitConversionPageReqVO pageReqVO) { PageResult pageResult = unitConversionService.getUnitConversionPage(pageReqVO); return success(BeanUtils.toBean(pageResult, UnitConversionRespVO.class)); @@ -92,7 +92,7 @@ public class UnitConversionController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出单位转换 Excel") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:export')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:export')") @ApiAccessLog(operateType = EXPORT) public void exportUnitConversionExcel(@Valid UnitConversionPageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -105,42 +105,42 @@ public class UnitConversionController implements BusinessControllerMarker { @PostMapping("/convert") @Operation(summary = "单位转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult convert(@Valid @RequestBody UnitConvertReqVO convertReqVO) { return success(unitConversionService.convert(convertReqVO)); } @PostMapping("/batch-convert") @Operation(summary = "批量单位转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult batchConvert(@Valid @RequestBody BatchUnitConvertReqVO batchReqVO) { return success(unitConversionService.batchConvert(batchReqVO)); } @PostMapping("/convert-by-symbol") @Operation(summary = "按单位符号转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult convertBySymbol(@Valid @RequestBody UnitConvertBySymbolReqVO reqVO) { return success(unitConversionService.convertBySymbol(reqVO)); } @PostMapping("/convert-by-name") @Operation(summary = "按单位名称转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult convertByName(@Valid @RequestBody UnitConvertByNameReqVO reqVO) { return success(unitConversionService.convertByName(reqVO)); } @PostMapping("/batch-convert-by-symbol") @Operation(summary = "批量按单位符号转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult batchConvertBySymbol(@Valid @RequestBody BatchUnitConvertBySymbolReqVO reqVO) { return success(unitConversionService.batchConvertBySymbol(reqVO)); } @PostMapping("/batch-convert-by-name") @Operation(summary = "批量按单位名称转换") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult batchConvertByName(@Valid @RequestBody BatchUnitConvertByNameReqVO reqVO) { return success(unitConversionService.batchConvertByName(reqVO)); } @@ -148,7 +148,7 @@ public class UnitConversionController implements BusinessControllerMarker { @GetMapping("/validate-paths") @Operation(summary = "校验量纲的转换路径") @Parameter(name = "quantityId", description = "量纲ID", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-conversion:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-conversion:query')") public CommonResult validateConversionPaths(@RequestParam("quantityId") Long quantityId) { return success(unitConversionService.validateConversionPaths(quantityId)); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java index 8dcf2033..08c19fcb 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/unitQuantity/UnitQuantityController.java @@ -43,14 +43,14 @@ public class UnitQuantityController implements BusinessControllerMarker { @PostMapping("/create") @Operation(summary = "创建计量单位量") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:create')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:create')") public CommonResult createUnitQuantity(@Valid @RequestBody UnitQuantitySaveReqVO createReqVO) { return success(unitQuantityService.createUnitQuantity(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新计量单位量") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:update')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:update')") public CommonResult updateUnitQuantity(@Valid @RequestBody UnitQuantitySaveReqVO updateReqVO) { unitQuantityService.updateUnitQuantity(updateReqVO); return success(true); @@ -59,7 +59,7 @@ public class UnitQuantityController implements BusinessControllerMarker { @DeleteMapping("/delete") @Operation(summary = "删除计量单位量") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:delete')") public CommonResult deleteUnitQuantity(@RequestParam("id") Long id) { unitQuantityService.deleteUnitQuantity(id); return success(true); @@ -68,7 +68,7 @@ public class UnitQuantityController implements BusinessControllerMarker { @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除计量单位量") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:delete')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:delete')") public CommonResult deleteUnitQuantityList(@RequestBody BatchDeleteReqVO req) { unitQuantityService.deleteUnitQuantityListByIds(req.getIds()); return success(true); @@ -77,7 +77,7 @@ public class UnitQuantityController implements BusinessControllerMarker { @GetMapping("/get") @Operation(summary = "获得计量单位量") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:query')") public CommonResult getUnitQuantity(@RequestParam("id") Long id) { UnitQuantityDO unitQuantity = unitQuantityService.getUnitQuantity(id); return success(BeanUtils.toBean(unitQuantity, UnitQuantityRespVO.class)); @@ -85,7 +85,7 @@ public class UnitQuantityController implements BusinessControllerMarker { @GetMapping("/page") @Operation(summary = "获得计量单位量分页") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:query')") public CommonResult> getUnitQuantityPage(@Valid UnitQuantityPageReqVO pageReqVO) { PageResult pageResult = unitQuantityService.getUnitQuantityPage(pageReqVO); return success(BeanUtils.toBean(pageResult, UnitQuantityRespVO.class)); @@ -93,7 +93,7 @@ public class UnitQuantityController implements BusinessControllerMarker { @GetMapping("/export-excel") @Operation(summary = "导出计量单位量 Excel") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:export')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:export')") @ApiAccessLog(operateType = EXPORT) public void exportUnitQuantityExcel(@Valid UnitQuantityPageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -106,7 +106,7 @@ public class UnitQuantityController implements BusinessControllerMarker { @GetMapping("/tree") @Operation(summary = "获取量纲及单位树") - @PreAuthorize("@ss.hasPermission('unitmanagement:unit-quantity:query')") + @PreAuthorize("@ss.hasPermission('unit-management:unit-quantity:query')") public CommonResult> getUnitQuantityTree() { return success(unitQuantityService.getUnitQuantityTree()); }