From 97432dbd7163b983ad04f178c57aa641520e21a7 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 14 Jul 2022 16:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80=E8=A1=A8?= =?UTF-8?q?=E5=89=8D=E7=BC=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../article/impl/ArticleCateServiceImpl.java | 12 ++++++------ .../article/impl/ArticleTextServiceImpl.java | 7 ++++--- .../system/impl/SystemAdminServiceImpl.java | 5 +++-- .../service/system/impl/SystemLogServerImpl.java | 3 ++- .../like-admin/src/main/resources/application.yml | 4 +++- .../java/com/hxkj/generator/config/GenConfig.java | 3 --- .../service/impl/GenerateServiceImpl.java | 3 +++ .../main/java/com/hxkj/generator/util/GenUtil.java | 3 ++- .../java/com/hxkj/generator/validate/GenParam.java | 14 ++++---------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java index 2f715616..91a566c0 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleCateServiceImpl.java @@ -104,8 +104,8 @@ public class ArticleCateServiceImpl implements IArticleCateService { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) .eq("id", id) .eq("is_delete", 0)); @@ -147,8 +147,8 @@ public class ArticleCateServiceImpl implements IArticleCateService { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) .eq("id", categoryParam.getId()) .eq("is_delete", 0)); @@ -171,8 +171,8 @@ public class ArticleCateServiceImpl implements IArticleCateService { ArticleCategory model = articleCategoryMapper.selectOne( new QueryWrapper() .select(ArticleCategory.class, info-> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) .eq("id", id) .eq("is_delete", 0)); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java index a71dfbc6..61e77d89 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/article/impl/ArticleTextServiceImpl.java @@ -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
mpjQueryWrapper = new MPJQueryWrapper
() .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")); @@ -89,8 +90,8 @@ public class ArticleTextServiceImpl implements IArticleTextService { Article model = articleMapper.selectOne( new QueryWrapper
() .select(Article.class, info-> - !info.getColumn().equals("is_delete") && - !info.getColumn().equals("delete_time")) + !info.getColumn().equals("is_delete") && + !info.getColumn().equals("delete_time")) .eq("id", id) .eq("is_delete", 0)); diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java index bb7c91cb..4644ddc9 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemAdminServiceImpl.java @@ -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[]{ diff --git a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java index 380bd47f..035314f5 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/service/system/impl/SystemLogServerImpl.java @@ -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 mpjQueryWrapper = new MPJQueryWrapper() .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[]{ diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index 6b987cf4..4f1a95da 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -55,4 +55,6 @@ mybatis-plus: global-config: banner: false db-config: - table-prefix: ls_ # 设置表前缀 \ No newline at end of file + table-prefix: ls_ # 设置表前缀 + configuration-properties: + prefix: ls_ # 自定义表前缀标签${prefix} \ No newline at end of file diff --git a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java index 538b27d5..ecafaa6b 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/config/GenConfig.java @@ -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; diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index c152536a..e661c4d0 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -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 item : genParam.getColumns()) { diff --git a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java index dc695bbd..3b43b4a1 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/util/GenUtil.java @@ -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); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java index 825c69af..a236e75c 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/validate/GenParam.java @@ -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 = ""; + }