修改统一表前缀管理
This commit is contained in:
TinyAnts
parent
082d64655e
commit
97432dbd71
|
|
@ -9,6 +9,7 @@ import com.hxkj.admin.validate.article.ArticleParam;
|
|||
import com.hxkj.admin.validate.common.PageParam;
|
||||
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
|
||||
import com.hxkj.admin.vo.common.article.ArticleListVo;
|
||||
import com.hxkj.common.config.GlobalConfig;
|
||||
import com.hxkj.common.core.PageResult;
|
||||
import com.hxkj.common.entity.article.Article;
|
||||
import com.hxkj.common.entity.article.ArticleCategory;
|
||||
|
|
@ -53,7 +54,7 @@ public class ArticleTextServiceImpl implements IArticleTextService {
|
|||
MPJQueryWrapper<Article> mpjQueryWrapper = new MPJQueryWrapper<Article>()
|
||||
.selectAll(Article.class)
|
||||
.select("ac.name as category")
|
||||
.innerJoin("ls_article_category ac ON ac.id=t.cid")
|
||||
.innerJoin("?_article_category ac ON ac.id=t.cid".replace("?_", GlobalConfig.tablePrefix))
|
||||
.eq("t.is_delete", 0)
|
||||
.orderByDesc(Arrays.asList("t.sort", "t.id"));
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import com.hxkj.admin.validate.system.SystemAdminParam;
|
|||
import com.hxkj.admin.vo.system.SystemAdminVo;
|
||||
import com.hxkj.admin.vo.system.SystemRoleVo;
|
||||
import com.hxkj.admin.vo.system.SystemSelfVo;
|
||||
import com.hxkj.common.config.GlobalConfig;
|
||||
import com.hxkj.common.core.PageResult;
|
||||
import com.hxkj.common.entity.system.SystemAdmin;
|
||||
import com.hxkj.common.entity.system.SystemMenu;
|
||||
|
|
@ -77,8 +78,8 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
|
|||
"sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," +
|
||||
"t.last_login_ip,t.last_login_time,t.create_time,t.update_time")
|
||||
.eq("t.is_delete", 0)
|
||||
.leftJoin("ls_system_role sr ON sr.id=t.role")
|
||||
.leftJoin("ls_system_dept sd ON sd.id=t.dept_id")
|
||||
.leftJoin("?_system_role sr ON sr.id=t.role".replace("?_", GlobalConfig.tablePrefix))
|
||||
.leftJoin("?_system_dept sd ON sd.id=t.dept_id".replace("?_", GlobalConfig.tablePrefix))
|
||||
.orderByDesc(Arrays.asList("t.id", "t.sort"));
|
||||
|
||||
systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import com.hxkj.admin.service.system.ISystemLogServer;
|
|||
import com.hxkj.admin.validate.common.PageParam;
|
||||
import com.hxkj.admin.vo.system.LogLoginVo;
|
||||
import com.hxkj.admin.vo.system.LogOperateVo;
|
||||
import com.hxkj.common.config.GlobalConfig;
|
||||
import com.hxkj.common.core.PageResult;
|
||||
import com.hxkj.common.entity.system.SystemLogLogin;
|
||||
import com.hxkj.common.entity.system.SystemLogOperate;
|
||||
|
|
@ -51,7 +52,7 @@ public class SystemLogServerImpl implements ISystemLogServer {
|
|||
MPJQueryWrapper<SystemLogOperate> mpjQueryWrapper = new MPJQueryWrapper<SystemLogOperate>()
|
||||
.selectAll(SystemLogOperate.class)
|
||||
.select("sa.username,sa.nickname")
|
||||
.leftJoin("ls_system_admin sa ON sa.id=t.admin_id")
|
||||
.leftJoin("?_system_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix))
|
||||
.orderByDesc("id");
|
||||
|
||||
logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{
|
||||
|
|
|
|||
|
|
@ -56,3 +56,5 @@ mybatis-plus:
|
|||
banner: false
|
||||
db-config:
|
||||
table-prefix: ls_ # 设置表前缀
|
||||
configuration-properties:
|
||||
prefix: ls_ # 自定义表前缀标签${prefix}
|
||||
|
|
@ -11,9 +11,6 @@ public class GenConfig {
|
|||
// 公共应用
|
||||
public static String commonPackage = "like-common/src/main/java/com/hxkj/common";
|
||||
|
||||
// 表前缀名
|
||||
public static String tablePrefix = "ls_";
|
||||
|
||||
// 是否去除表前缀
|
||||
public static Boolean isRemoveTablePrefix = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|||
import com.baomidou.mybatisplus.core.toolkit.Assert;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.hxkj.common.config.GlobalConfig;
|
||||
import com.hxkj.common.core.PageResult;
|
||||
|
||||
import com.hxkj.common.exception.OperateException;
|
||||
|
|
@ -232,6 +233,8 @@ public class GenerateServiceImpl implements IGenerateService {
|
|||
model.setGenTpl(genParam.getGenTpl());
|
||||
model.setGenType(genParam.getGenType());
|
||||
model.setGenPath(genParam.getGenPath());
|
||||
model.setSubTableFk(genParam.getSubTableFk());
|
||||
model.setSubTableName(genParam.getSubTableName().replace(GlobalConfig.tablePrefix, ""));
|
||||
genTableMapper.updateById(model);
|
||||
|
||||
for (Map<String, String> item : genParam.getColumns()) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.hxkj.generator.util;
|
||||
|
||||
import com.hxkj.common.config.GlobalConfig;
|
||||
import com.hxkj.generator.constant.GenConstants;
|
||||
import com.hxkj.common.utils.StringUtil;
|
||||
import com.hxkj.generator.config.GenConfig;
|
||||
|
|
@ -166,7 +167,7 @@ public class GenUtil {
|
|||
* @return 类名
|
||||
*/
|
||||
public static String toClassName(String tableName) {
|
||||
String tablePrefix = GenConfig.tablePrefix;
|
||||
String tablePrefix = GlobalConfig.tablePrefix;
|
||||
if (GenConfig.isRemoveTablePrefix && StringUtil.isNotEmpty(tablePrefix)) {
|
||||
String[] searchList = StringUtil.split(tablePrefix, ",");
|
||||
tableName = replaceFirst(tableName, searchList);
|
||||
|
|
|
|||
|
|
@ -54,21 +54,11 @@ public class GenParam implements Serializable {
|
|||
@StringContains(values = {"curd", "tree"}, message = "选择的生成模板不符合")
|
||||
private String genTpl;
|
||||
|
||||
@NotNull(message = "packageName参数缺失")
|
||||
@NotEmpty(message = "生成包路径不能为空")
|
||||
@Length(min = 1, max = 60, message = "生成包路径不能大于200个字符")
|
||||
private String packageName;
|
||||
|
||||
@NotNull(message = "moduleName参数缺失")
|
||||
@NotEmpty(message = "生成模块名不能为空")
|
||||
@Length(min = 1, max = 60, message = "生成模块名不能大于60个字符")
|
||||
private String moduleName;
|
||||
|
||||
@NotNull(message = "businessName参数缺失")
|
||||
@NotEmpty(message = "生成业务名不能为空")
|
||||
@Length(min = 1, max = 60, message = "生成业务名不能大于60个字符")
|
||||
private String businessName;
|
||||
|
||||
@NotNull(message = "functionName参数缺失")
|
||||
@NotEmpty(message = "生成功能名不能为空")
|
||||
@Length(min = 1, max = 60, message = "生成功能名不能大于60个字符")
|
||||
|
|
@ -87,4 +77,8 @@ public class GenParam implements Serializable {
|
|||
|
||||
private String treeParent = "";
|
||||
|
||||
private String subTableName = "";
|
||||
|
||||
private String subTableFk = "";
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue