opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update 优化 统一Service命名格式

Browse Source
This commit is contained in:
疯狂的狮子li 2023-02-08 10:27:58 +08:00
parent 21ed566b4d
commit b70c7039f5
8 changed files with 70 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View File

@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
@RequestMapping("/demo/demo") @RequestMapping("/demo/demo")
public class TestDemoController extends BaseController { public class TestDemoController extends BaseController {
private final ITestDemoService iTestDemoService; private final ITestDemoService testDemoService;
/** /**
* 查询测试单表列表 * 查询测试单表列表
@ -53,7 +53,7 @@ public class TestDemoController extends BaseController {
@SaCheckPermission("demo:demo:list") @SaCheckPermission("demo:demo:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
return iTestDemoService.queryPageList(bo, pageQuery); return testDemoService.queryPageList(bo, pageQuery);
} }
/** /**
@ -62,7 +62,7 @@ public class TestDemoController extends BaseController {
@SaCheckPermission("demo:demo:list") @SaCheckPermission("demo:demo:list")
@GetMapping("/page") @GetMapping("/page")
public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
return iTestDemoService.customPageList(bo, pageQuery); return testDemoService.customPageList(bo, pageQuery);
} }
/** /**
@ -77,7 +77,7 @@ public class TestDemoController extends BaseController {
ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true); ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true);
List<TestDemoImportVo> volist = excelResult.getList(); List<TestDemoImportVo> volist = excelResult.getList();
List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class); List<TestDemo> list = BeanUtil.copyToList(volist, TestDemo.class);
iTestDemoService.saveBatch(list); testDemoService.saveBatch(list);
return R.ok(excelResult.getAnalysis()); return R.ok(excelResult.getAnalysis());
} }
@ -88,7 +88,7 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.EXPORT) @Log(title = "测试单表", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(@Validated TestDemoBo bo, HttpServletResponse response) { public void export(@Validated TestDemoBo bo, HttpServletResponse response) {
List<TestDemoVo> list = iTestDemoService.queryList(bo); List<TestDemoVo> list = testDemoService.queryList(bo);
// 测试雪花id导出 // 测试雪花id导出
// for (TestDemoVo vo : list) { // for (TestDemoVo vo : list) {
// vo.setId(1234567891234567893L); // vo.setId(1234567891234567893L);
@ -105,7 +105,7 @@ public class TestDemoController extends BaseController {
@GetMapping("/{id}") @GetMapping("/{id}")
public R<TestDemoVo> getInfo(@NotNull(message = "主键不能为空") public R<TestDemoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) { @PathVariable("id") Long id) {
return R.ok(iTestDemoService.queryById(id)); return R.ok(testDemoService.queryById(id));
} }
/** /**
@ -119,7 +119,7 @@ public class TestDemoController extends BaseController {
// 使用校验工具对标 @Validated(AddGroup.class) 注解 // 使用校验工具对标 @Validated(AddGroup.class) 注解
// 用于在非 Controller 的地方校验对象 // 用于在非 Controller 的地方校验对象
ValidatorUtils.validate(bo, AddGroup.class); ValidatorUtils.validate(bo, AddGroup.class);
return toAjax(iTestDemoService.insertByBo(bo)); return toAjax(testDemoService.insertByBo(bo));
} }
/** /**
@ -130,7 +130,7 @@ public class TestDemoController extends BaseController {
@RepeatSubmit @RepeatSubmit
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
return toAjax(iTestDemoService.updateByBo(bo)); return toAjax(testDemoService.updateByBo(bo));
} }
/** /**
@ -143,6 +143,6 @@ public class TestDemoController extends BaseController {
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(iTestDemoService.deleteWithValidByIds(Arrays.asList(ids), true)); return toAjax(testDemoService.deleteWithValidByIds(Arrays.asList(ids), true));
} }
} }

14
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
View File

@ -35,7 +35,7 @@ import java.util.List;
@RequestMapping("/demo/tree") @RequestMapping("/demo/tree")
public class TestTreeController extends BaseController { public class TestTreeController extends BaseController {
private final ITestTreeService iTestTreeService; private final ITestTreeService testTreeService;
/** /**
* 查询测试树表列表 * 查询测试树表列表
@ -43,7 +43,7 @@ public class TestTreeController extends BaseController {
@SaCheckPermission("demo:tree:list") @SaCheckPermission("demo:tree:list")
@GetMapping("/list") @GetMapping("/list")
public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) { public R<List<TestTreeVo>> list(@Validated(QueryGroup.class) TestTreeBo bo) {
List<TestTreeVo> list = iTestTreeService.queryList(bo); List<TestTreeVo> list = testTreeService.queryList(bo);
return R.ok(list); return R.ok(list);
} }
@ -54,7 +54,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.EXPORT) @Log(title = "测试树表", businessType = BusinessType.EXPORT)
@GetMapping("/export") @GetMapping("/export")
public void export(@Validated TestTreeBo bo, HttpServletResponse response) { public void export(@Validated TestTreeBo bo, HttpServletResponse response) {
List<TestTreeVo> list = iTestTreeService.queryList(bo); List<TestTreeVo> list = testTreeService.queryList(bo);
ExcelUtil.exportExcel(list, "测试树表", TestTreeVo.class, response); ExcelUtil.exportExcel(list, "测试树表", TestTreeVo.class, response);
} }
@ -67,7 +67,7 @@ public class TestTreeController extends BaseController {
@GetMapping("/{id}") @GetMapping("/{id}")
public R<TestTreeVo> getInfo(@NotNull(message = "主键不能为空") public R<TestTreeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) { @PathVariable("id") Long id) {
return R.ok(iTestTreeService.queryById(id)); return R.ok(testTreeService.queryById(id));
} }
/** /**
@ -78,7 +78,7 @@ public class TestTreeController extends BaseController {
@RepeatSubmit @RepeatSubmit
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.insertByBo(bo)); return toAjax(testTreeService.insertByBo(bo));
} }
/** /**
@ -89,7 +89,7 @@ public class TestTreeController extends BaseController {
@RepeatSubmit @RepeatSubmit
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.updateByBo(bo)); return toAjax(testTreeService.updateByBo(bo));
} }
/** /**
@ -102,6 +102,6 @@ public class TestTreeController extends BaseController {
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(iTestTreeService.deleteWithValidByIds(Arrays.asList(ids), true)); return toAjax(testTreeService.deleteWithValidByIds(Arrays.asList(ids), true));
} }
} }

14
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View File

@ -39,7 +39,7 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
@RequestMapping("/${moduleName}/${businessName}") @RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController { public class ${ClassName}Controller extends BaseController {
private final I${ClassName}Service i${ClassName}Service; private final I${ClassName}Service ${className}Service;
/** /**
* 查询${functionName}列表 * 查询${functionName}列表
@ -52,7 +52,7 @@ public class ${ClassName}Controller extends BaseController {
} }
#elseif($table.tree) #elseif($table.tree)
public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) { public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo); List<${ClassName}Vo> list = ${className}Service.queryList(bo);
return R.ok(list); return R.ok(list);
} }
#end #end
@ -64,7 +64,7 @@ public class ${ClassName}Controller extends BaseController {
@Log(title = "${functionName}", businessType = BusinessType.EXPORT) @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(${ClassName}Bo bo, HttpServletResponse response) { public void export(${ClassName}Bo bo, HttpServletResponse response) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo); List<${ClassName}Vo> list = ${className}Service.queryList(bo);
ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response); ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
} }
@ -77,7 +77,7 @@ public class ${ClassName}Controller extends BaseController {
@GetMapping("/{${pkColumn.javaField}}") @GetMapping("/{${pkColumn.javaField}}")
public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空") public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) { @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
return R.ok(i${ClassName}Service.queryById(${pkColumn.javaField})); return R.ok(${className}Service.queryById(${pkColumn.javaField}));
} }
/** /**
@ -88,7 +88,7 @@ public class ${ClassName}Controller extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
return toAjax(i${ClassName}Service.insertByBo(bo)); return toAjax(${className}Service.insertByBo(bo));
} }
/** /**
@ -99,7 +99,7 @@ public class ${ClassName}Controller extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
return toAjax(i${ClassName}Service.updateByBo(bo)); return toAjax(${className}Service.updateByBo(bo));
} }
/** /**
@ -112,6 +112,6 @@ public class ${ClassName}Controller extends BaseController {
@DeleteMapping("/{${pkColumn.javaField}s}") @DeleteMapping("/{${pkColumn.javaField}s}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
return toAjax(i${ClassName}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true)); return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true));
} }
} }

14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java
View File

@ -35,7 +35,7 @@ import java.util.List;
@RequestMapping("/system/oss/config") @RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController { public class SysOssConfigController extends BaseController {
private final ISysOssConfigService iSysOssConfigService; private final ISysOssConfigService sysOssConfigService;
/** /**
* 查询对象存储配置列表 * 查询对象存储配置列表
@ -43,7 +43,7 @@ public class SysOssConfigController extends BaseController {
@SaCheckPermission("system:oss:list") @SaCheckPermission("system:oss:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
return iSysOssConfigService.queryPageList(bo, pageQuery); return sysOssConfigService.queryPageList(bo, pageQuery);
} }
/** /**
@ -55,7 +55,7 @@ public class SysOssConfigController extends BaseController {
@GetMapping("/{ossConfigId}") @GetMapping("/{ossConfigId}")
public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空") public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long ossConfigId) { @PathVariable Long ossConfigId) {
return R.ok(iSysOssConfigService.queryById(ossConfigId)); return R.ok(sysOssConfigService.queryById(ossConfigId));
} }
/** /**
@ -66,7 +66,7 @@ public class SysOssConfigController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.insertByBo(bo)); return toAjax(sysOssConfigService.insertByBo(bo));
} }
/** /**
@ -77,7 +77,7 @@ public class SysOssConfigController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateByBo(bo)); return toAjax(sysOssConfigService.updateByBo(bo));
} }
/** /**
@ -90,7 +90,7 @@ public class SysOssConfigController extends BaseController {
@DeleteMapping("/{ossConfigIds}") @DeleteMapping("/{ossConfigIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossConfigIds) { @PathVariable Long[] ossConfigIds) {
return toAjax(iSysOssConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); return toAjax(sysOssConfigService.deleteWithValidByIds(List.of(ossConfigIds), true));
} }
/** /**
@ -100,6 +100,6 @@ public class SysOssConfigController extends BaseController {
@Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) { public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo)); return toAjax(sysOssConfigService.updateOssConfigStatus(bo));
} }
} }

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
View File

@ -38,7 +38,7 @@ import java.util.List;
@RequestMapping("/system/oss") @RequestMapping("/system/oss")
public class SysOssController extends BaseController { public class SysOssController extends BaseController {
private final ISysOssService iSysOssService; private final ISysOssService sysOssService;
/** /**
* 查询OSS对象存储列表 * 查询OSS对象存储列表
@ -46,7 +46,7 @@ public class SysOssController extends BaseController {
@SaCheckPermission("system:oss:list") @SaCheckPermission("system:oss:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
return iSysOssService.queryPageList(bo, pageQuery); return sysOssService.queryPageList(bo, pageQuery);
} }
/** /**
@ -58,7 +58,7 @@ public class SysOssController extends BaseController {
@GetMapping("/listByIds/{ossIds}") @GetMapping("/listByIds/{ossIds}")
public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空") public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossIds) { @PathVariable Long[] ossIds) {
List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds)); List<SysOssVo> list = sysOssService.listByIds(Arrays.asList(ossIds));
return R.ok(list); return R.ok(list);
} }
@ -74,7 +74,7 @@ public class SysOssController extends BaseController {
if (ObjectUtil.isNull(file)) { if (ObjectUtil.isNull(file)) {
throw new ServiceException("上传文件不能为空"); throw new ServiceException("上传文件不能为空");
} }
SysOssVo oss = iSysOssService.upload(file); SysOssVo oss = sysOssService.upload(file);
SysOssUploadVo uploadVo = new SysOssUploadVo(); SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl()); uploadVo.setUrl(oss.getUrl());
uploadVo.setFileName(oss.getOriginalName()); uploadVo.setFileName(oss.getOriginalName());
@ -90,7 +90,7 @@ public class SysOssController extends BaseController {
@SaCheckPermission("system:oss:download") @SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}") @GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
iSysOssService.download(ossId, response); sysOssService.download(ossId, response);
} }
/** /**
@ -103,7 +103,7 @@ public class SysOssController extends BaseController {
@DeleteMapping("/{ossIds}") @DeleteMapping("/{ossIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossIds) { @PathVariable Long[] ossIds) {
return toAjax(iSysOssService.deleteWithValidByIds(List.of(ossIds), true)); return toAjax(sysOssService.deleteWithValidByIds(List.of(ossIds), true));
} }
} }

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
View File

@ -39,7 +39,7 @@ import java.util.Arrays;
public class SysProfileController extends BaseController { public class SysProfileController extends BaseController {
private final ISysUserService userService; private final ISysUserService userService;
private final ISysOssService iSysOssService; private final ISysOssService sysOssService;
/** /**
* 个人信息 * 个人信息
@ -114,7 +114,7 @@ public class SysProfileController extends BaseController {
if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
} }
SysOssVo oss = iSysOssService.upload(avatarfile); SysOssVo oss = sysOssService.upload(avatarfile);
String avatar = oss.getUrl(); String avatar = oss.getUrl();
if (userService.updateUserAvatar(LoginHelper.getUsername(), oss.getOssId())) { if (userService.updateUserAvatar(LoginHelper.getUsername(), oss.getOssId())) {
AvatarVo avatarVo = new AvatarVo(); AvatarVo avatarVo = new AvatarVo();

16
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantController.java
View File

@ -39,7 +39,7 @@ import java.util.List;
@RequestMapping("/system/tenant") @RequestMapping("/system/tenant")
public class SysTenantController extends BaseController { public class SysTenantController extends BaseController {
private final ISysTenantService iSysTenantService; private final ISysTenantService sysTenantService;
private final ISysUserService sysUserService; private final ISysUserService sysUserService;
/** /**
@ -48,7 +48,7 @@ public class SysTenantController extends BaseController {
@SaCheckPermission("system:tenant:list") @SaCheckPermission("system:tenant:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) { public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
return iSysTenantService.queryPageList(bo, pageQuery); return sysTenantService.queryPageList(bo, pageQuery);
} }
/** /**
@ -58,7 +58,7 @@ public class SysTenantController extends BaseController {
@Log(title = "租户", businessType = BusinessType.EXPORT) @Log(title = "租户", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(SysTenantBo bo, HttpServletResponse response) { public void export(SysTenantBo bo, HttpServletResponse response) {
List<SysTenantVo> list = iSysTenantService.queryList(bo); List<SysTenantVo> list = sysTenantService.queryList(bo);
ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response); ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response);
} }
@ -71,7 +71,7 @@ public class SysTenantController extends BaseController {
@GetMapping("/{id}") @GetMapping("/{id}")
public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空") public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) { @PathVariable Long id) {
return R.ok(iSysTenantService.queryById(id)); return R.ok(sysTenantService.queryById(id));
} }
/** /**
@ -89,7 +89,7 @@ public class SysTenantController extends BaseController {
if (UserConstants.NOT_UNIQUE.equals(sysUserService.checkUserNameUnique(userBo))) { if (UserConstants.NOT_UNIQUE.equals(sysUserService.checkUserNameUnique(userBo))) {
throw new ServiceException("新增用户'" + bo.getUsername() + "'失败，登录账号已存在"); throw new ServiceException("新增用户'" + bo.getUsername() + "'失败，登录账号已存在");
} }
return toAjax(iSysTenantService.insertByBo(bo)); return toAjax(sysTenantService.insertByBo(bo));
} }
/** /**
@ -100,7 +100,7 @@ public class SysTenantController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
return toAjax(iSysTenantService.updateByBo(bo)); return toAjax(sysTenantService.updateByBo(bo));
} }
/** /**
@ -110,7 +110,7 @@ public class SysTenantController extends BaseController {
@Log(title = "租户套餐", businessType = BusinessType.UPDATE) @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysTenantBo bo) { public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
return toAjax(iSysTenantService.updateTenantStatus(bo)); return toAjax(sysTenantService.updateTenantStatus(bo));
} }
/** /**
@ -123,6 +123,6 @@ public class SysTenantController extends BaseController {
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) { @PathVariable Long[] ids) {
return toAjax(iSysTenantService.deleteWithValidByIds(List.of(ids), true)); return toAjax(sysTenantService.deleteWithValidByIds(List.of(ids), true));
} }
} }

47
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysTenantPackageController.java
View File

@ -1,26 +1,27 @@
package com.ruoyi.system.controller.system; package com.ruoyi.system.controller.system;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.excel.utils.ExcelUtil; import com.ruoyi.common.excel.utils.ExcelUtil;
import com.ruoyi.system.domain.vo.SysTenantPackageVo; import com.ruoyi.common.idempotent.annotation.RepeatSubmit;
import com.ruoyi.system.domain.bo.SysTenantPackageBo; import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.system.service.ISysTenantPackageService; import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.mybatis.core.page.PageQuery;
import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.mybatis.core.page.TableDataInfo;
import com.ruoyi.common.web.core.BaseController;
import com.ruoyi.system.domain.bo.SysTenantPackageBo;
import com.ruoyi.system.domain.vo.SysTenantPackageVo;
import com.ruoyi.system.service.ISysTenantPackageService;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* 租户套餐管理 * 租户套餐管理
@ -33,7 +34,7 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo;
@RequestMapping("/system/tenant/package") @RequestMapping("/system/tenant/package")
public class SysTenantPackageController extends BaseController { public class SysTenantPackageController extends BaseController {
private final ISysTenantPackageService iSysTenantPackageService; private final ISysTenantPackageService sysTenantPackageService;
/** /**
* 查询租户套餐列表 * 查询租户套餐列表
@ -41,7 +42,7 @@ public class SysTenantPackageController extends BaseController {
@SaCheckPermission("system:tenantPackage:list") @SaCheckPermission("system:tenantPackage:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) { public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
return iSysTenantPackageService.queryPageList(bo, pageQuery); return sysTenantPackageService.queryPageList(bo, pageQuery);
} }
/** /**
@ -51,7 +52,7 @@ public class SysTenantPackageController extends BaseController {
@Log(title = "租户套餐", businessType = BusinessType.EXPORT) @Log(title = "租户套餐", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(SysTenantPackageBo bo, HttpServletResponse response) { public void export(SysTenantPackageBo bo, HttpServletResponse response) {
List<SysTenantPackageVo> list = iSysTenantPackageService.queryList(bo); List<SysTenantPackageVo> list = sysTenantPackageService.queryList(bo);
ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response); ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response);
} }
@ -64,7 +65,7 @@ public class SysTenantPackageController extends BaseController {
@GetMapping("/{packageId}") @GetMapping("/{packageId}")
public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空") public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long packageId) { @PathVariable Long packageId) {
return R.ok(iSysTenantPackageService.queryById(packageId)); return R.ok(sysTenantPackageService.queryById(packageId));
} }
/** /**
@ -75,7 +76,7 @@ public class SysTenantPackageController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) {
return toAjax(iSysTenantPackageService.insertByBo(bo)); return toAjax(sysTenantPackageService.insertByBo(bo));
} }
/** /**
@ -86,7 +87,7 @@ public class SysTenantPackageController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) {
return toAjax(iSysTenantPackageService.updateByBo(bo)); return toAjax(sysTenantPackageService.updateByBo(bo));
} }
/** /**
@ -96,7 +97,7 @@ public class SysTenantPackageController extends BaseController {
@Log(title = "租户套餐", businessType = BusinessType.UPDATE) @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysTenantPackageBo bo) { public R<Void> changeStatus(@RequestBody SysTenantPackageBo bo) {
return toAjax(iSysTenantPackageService.updatePackageStatus(bo)); return toAjax(sysTenantPackageService.updatePackageStatus(bo));
} }
/** /**
@ -109,6 +110,6 @@ public class SysTenantPackageController extends BaseController {
@DeleteMapping("/{packageIds}") @DeleteMapping("/{packageIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] packageIds) { @PathVariable Long[] packageIds) {
return toAjax(iSysTenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); return toAjax(sysTenantPackageService.deleteWithValidByIds(List.of(packageIds), true));
} }
} }