From ee7c5fbbd9fe0073713f5873c8bf7cc04c4d3677 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 五月 2023 11:32:12 +0800
Subject: [PATCH] update 优化 !pr349 相关代码 完成代码生成多数据源统一存储
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 7 ++-----
ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml | 7 +++----
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java | 7 ++-----
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java | 2 +-
4 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java
index 87f4f1e..2d8b886 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java
@@ -18,7 +18,7 @@
* 鏍规嵁琛ㄥ悕绉版煡璇㈠垪淇℃伅
*
* @param tableName 琛ㄥ悕绉�
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
* @return 鍒椾俊鎭�
*/
@DS("#dataName")
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index 77ef303..8d0e38f 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -54,7 +54,6 @@
*
* @author Lion Li
*/
-// @DS("#header.datasource")
@Slf4j
@RequiredArgsConstructor
@Service
@@ -120,7 +119,7 @@
* 鏌ヨ鎹簱鍒楄〃
*
* @param tableNames 琛ㄥ悕绉扮粍
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
* @return 鏁版嵁搴撹〃闆嗗悎
*/
@DS("#dataName")
@@ -143,7 +142,6 @@
* 淇敼涓氬姟
*
* @param genTable 涓氬姟淇℃伅
- * @return 缁撴灉
*/
@Transactional(rollbackFor = Exception.class)
@Override
@@ -162,7 +160,6 @@
* 鍒犻櫎涓氬姟瀵硅薄
*
* @param tableIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
*/
@Transactional(rollbackFor = Exception.class)
@Override
@@ -176,7 +173,7 @@
* 瀵煎叆琛ㄧ粨鏋�
*
* @param tableList 瀵煎叆琛ㄥ垪琛�
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
*/
@DSTransactional
@Override
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
index 51d3e23..2a2fb82 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
@@ -43,7 +43,7 @@
* 鏌ヨ鎹簱鍒楄〃
*
* @param tableNames 琛ㄥ悕绉扮粍
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
* @return 鏁版嵁搴撹〃闆嗗悎
*/
List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName);
@@ -67,7 +67,6 @@
* 淇敼涓氬姟
*
* @param genTable 涓氬姟淇℃伅
- * @return 缁撴灉
*/
void updateGenTable(GenTable genTable);
@@ -75,7 +74,6 @@
* 鍒犻櫎涓氬姟淇℃伅
*
* @param tableIds 闇�瑕佸垹闄ょ殑琛ㄦ暟鎹甀D
- * @return 缁撴灉
*/
void deleteGenTableByIds(Long[] tableIds);
@@ -83,7 +81,7 @@
* 瀵煎叆琛ㄧ粨鏋�
*
* @param tableList 瀵煎叆琛ㄥ垪琛�
- * @param dataName
+ * @param dataName 鏁版嵁婧愬悕绉�
*/
void importGenTable(List<GenTable> tableList, String dataName);
@@ -107,7 +105,6 @@
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*
* @param tableId 琛ㄥ悕绉�
- * @return 鏁版嵁
*/
void generatorCode(Long tableId);
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 5641f85..f4f86e6 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -125,7 +125,6 @@
and dt.table_name = uo.object_name
and uo.object_type = 'TABLE'
AND dt.table_name NOT LIKE 'XXL_JOB_%' AND dt.table_name NOT LIKE 'GEN_%'
- AND dt.table_name NOT IN (select table_name from gen_table)
and lower(dt.table_name) in
<foreach collection="array" item="name" open="(" separator="," close=")">
#{name}
@@ -161,9 +160,9 @@
AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
AND D.NAME NOT LIKE 'xxl_job_%' AND D.NAME NOT LIKE 'gen_%'
AND D.NAME in
- <foreach collection="array" item="name" open="(" separator="," close=")">
- #{name}
- </foreach>
+ <foreach collection="array" item="name" open="(" separator="," close=")">
+ #{name}
+ </foreach>
</if>
</select>
--
Gitblit v1.9.3