From 45ac0f23e12ac2a45c6affe9e39d0897e4fad618 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 二月 2023 17:06:10 +0800
Subject: [PATCH] !286 合并 多租户功能 * add 新增 ruoyi-common-tenant 多租户模块 全框架适配多租户改动 * update 优化 隐藏页面主键 * remove 移除 缓存列表功能(多租户缓存功能繁杂多样 没有办法在页面管理) * update 重构 全局缓存KEY 与 常用缓存KEY做区分 * update 重构 OssFactory 加载方式 改为每次比对配置做实例更新 * update 优化 SaTokenDao 改为 Bean 注入 便于扩展 * update 重构 项目初始化数据改为懒加载 不提供热加载 * update 重构 验证码开关使用配置文件(经调查少有动态开启需求) * update 优化 启用 sqlserver 高版本语法 简化sql脚本语法 * update 优化 DataPermissionHelper 增加 开启/关闭 忽略数据权限功能 * update 优化 连接池增加 keepaliveTime 探活参数 * update 优化 调整连接池最长生命周期 防止出现警告 * update 优化 代码生成页面模板 校验不必要的表单数据 * add 新增 StringUtils splitTo 与 splitList 方法 优化业务代码
---
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index ee6fdd2..761284f 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -39,7 +39,7 @@
@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController {
- private final I${ClassName}Service i${ClassName}Service;
+ private final I${ClassName}Service ${className}Service;
/**
* 鏌ヨ${functionName}鍒楄〃
@@ -52,7 +52,7 @@
}
#elseif($table.tree)
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);
}
#end
@@ -64,7 +64,7 @@
@Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export")
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);
}
@@ -77,7 +77,7 @@
@GetMapping("/{${pkColumn.javaField}}")
public R<${ClassName}Vo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@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 @@
@RepeatSubmit()
@PostMapping()
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 @@
@RepeatSubmit()
@PutMapping()
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 @@
@DeleteMapping("/{${pkColumn.javaField}s}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@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));
}
}
--
Gitblit v1.9.3