diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java index 6975e4a423..2470dd9588 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java @@ -95,27 +95,4 @@ public class AutocodeRecordController { BeanUtils.toBean(list, AutocodeRecordRespVO.class)); } - @Autowired - private AutoCodeUtil autoCodeUtil; - - @Operation(summary = "获取一个自动生成的编码") - @Parameters({ - @Parameter(name = "ruleCode", description = "规则编码", required = true), - @Parameter(name = "inputCharacter", description = "输入字符", required = false) - }) - @GetMapping(value = "/getAutoCode") - public CommonResult getAutoCode(@RequestParam("ruleCode") String ruleCode, String inputCharacter){ - String code = autoCodeUtil.genSerialCode(ruleCode,inputCharacter); - return CommonResult.success(code); - } - @Operation(summary = "测试自动生成的编码") - @Parameters({ - @Parameter(name = "ruleCode", description = "规则编码", required = true), - @Parameter(name = "inputCharacter", description = "输入字符", required = false) - }) - @GetMapping(value = "/getTest") - public CommonResult getAutoCodeTest(@RequestParam("ruleCode") String ruleCode,String inputCharacter){ - String code = autoCodeUtil.genSerialCodeTest(ruleCode,inputCharacter); - return CommonResult.success(code); - } } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java index e277fbedce..1301464b20 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.erp.controller.admin.autocode; +import cn.iocoder.yudao.module.erp.controller.admin.autocode.util.AutoCodeUtil; +import io.swagger.v3.oas.annotations.Parameters; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -102,5 +105,27 @@ public class AutocodeRuleController { public CommonResult> getAutocodePartListByRuleId(@RequestParam("ruleId") Long ruleId) { return success(autocodeRuleService.getAutocodePartListByRuleId(ruleId)); } - + @Autowired + private AutoCodeUtil autoCodeUtil; + + @Operation(summary = "获取一个自动生成的编码") + @Parameters({ + @Parameter(name = "ruleCode", description = "规则编码", required = true), + @Parameter(name = "inputCharacter", description = "输入字符", required = false) + }) + @GetMapping(value = "/getAutoCode") + public CommonResult getAutoCode(@RequestParam("ruleCode") String ruleCode, String inputCharacter){ + String code = autoCodeUtil.genSerialCode(ruleCode,inputCharacter); + return CommonResult.success(code); + } + @Operation(summary = "测试自动生成的编码") + @Parameters({ + @Parameter(name = "ruleCode", description = "规则编码", required = true), + @Parameter(name = "inputCharacter", description = "输入字符", required = false) + }) + @GetMapping(value = "/getTestCode") + public CommonResult getAutoCodeTest(@RequestParam("ruleCode") String ruleCode,String inputCharacter){ + String code = autoCodeUtil.genSerialCodeTest(ruleCode,inputCharacter); + return CommonResult.success(code); + } } \ No newline at end of file