From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 54 ++++++++++--------------------------------------------
1 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 085589f..37c7a82 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -10,16 +10,16 @@
import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.GenConstants;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.helper.LoginHelper;
-import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.StreamUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.constant.GenConstants;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.JsonUtils;
+import com.ruoyi.common.core.utils.StreamUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.file.FileUtils;
+import com.ruoyi.common.mybatis.core.page.PageQuery;
+import com.ruoyi.common.mybatis.core.page.TableDataInfo;
+import com.ruoyi.common.satoken.utils.LoginHelper;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.mapper.GenTableColumnMapper;
@@ -210,8 +210,6 @@
menuIds.add(identifierGenerator.nextId(null).longValue());
}
table.setMenuIds(menuIds);
- // 璁剧疆涓诲瓙琛ㄤ俊鎭�
- setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
setPkColumn(table);
VelocityInitializer.initVelocity();
@@ -254,8 +252,6 @@
public void generatorCode(String tableName) {
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableByName(tableName);
- // 璁剧疆涓诲瓙琛ㄤ俊鎭�
- setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
setPkColumn(table);
@@ -360,8 +356,6 @@
menuIds.add(identifierGenerator.nextId(null).longValue());
}
table.setMenuIds(menuIds);
- // 璁剧疆涓诲瓙琛ㄤ俊鎭�
- setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
setPkColumn(table);
@@ -405,12 +399,6 @@
throw new ServiceException("鏍戠埗缂栫爜瀛楁涓嶈兘涓虹┖");
} else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
throw new ServiceException("鏍戝悕绉板瓧娈典笉鑳戒负绌�");
- } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
- if (StringUtils.isEmpty(genTable.getSubTableName())) {
- throw new ServiceException("鍏宠仈瀛愯〃鐨勮〃鍚嶄笉鑳戒负绌�");
- } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
- throw new ServiceException("瀛愯〃鍏宠仈鐨勫閿悕涓嶈兘涓虹┖");
- }
}
}
}
@@ -430,29 +418,7 @@
if (ObjectUtil.isNull(table.getPkColumn())) {
table.setPkColumn(table.getColumns().get(0));
}
- if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
- for (GenTableColumn column : table.getSubTable().getColumns()) {
- if (column.isPk()) {
- table.getSubTable().setPkColumn(column);
- break;
- }
- }
- if (ObjectUtil.isNull(table.getSubTable().getPkColumn())) {
- table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
- }
- }
- }
- /**
- * 璁剧疆涓诲瓙琛ㄤ俊鎭�
- *
- * @param table 涓氬姟琛ㄤ俊鎭�
- */
- public void setSubTable(GenTable table) {
- String subTableName = table.getSubTableName();
- if (StringUtils.isNotEmpty(subTableName)) {
- table.setSubTable(baseMapper.selectGenTableByName(subTableName));
- }
}
/**
--
Gitblit v1.9.3