From a6a822e39e5550f82f63706f5308fa2f38af476f Mon Sep 17 00:00:00 2001
From: dftre <3066417822@qq.com>
Date: Tue, 25 Feb 2025 17:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84GenTableVo=E7=B1=BB=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=90=8D=E5=92=8C=E5=88=97=E5=90=8D=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E6=96=B9=E6=B3=95=EF=BC=8C=E6=94=B9=E4=B8=BA=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9B=B8=E5=BA=94=E7=9A=84=E5=AF=B9=E8=B1=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0VelocityUtils=E5=92=8Cmapper=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=BB=A5=E4=BD=BF=E7=94=A8=E6=96=B0=E7=9A=84=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/generator/domain/vo/GenTableVo.java | 18 +++---
 .../ruoyi/generator/util/VelocityUtils.java   |  4 +-
 .../src/main/resources/vm/xml/mapper.xml.vm   | 63 +++++++------------
 3 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/vo/GenTableVo.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/vo/GenTableVo.java
index d607547..a5b9eb1 100644
--- a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/vo/GenTableVo.java
+++ b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/vo/GenTableVo.java
@@ -64,15 +64,15 @@ public class GenTableVo extends BaseEntity {
         return allGenTableColumns;
     }
 
-    public Map<Long, String> getTableNameMap() {
-        Map<Long, String> tableMap = new HashMap<>();
+    public Map<Long, GenTable> getTableMap() {
+        Map<Long, GenTable> tableMap = new HashMap<>();
         if (table != null) {
-            tableMap.put(table.getTableId(), table.getTableName());
+            tableMap.put(table.getTableId(), table);
         }
         if (joinTables != null) {
             for (GenTable genTable : joinTables) {
                 if (genTable != null) {
-                    tableMap.put(genTable.getTableId(), genTable.getTableName());
+                    tableMap.put(genTable.getTableId(), genTable);
                 }
             }
         }
@@ -95,12 +95,12 @@ public class GenTableVo extends BaseEntity {
         return tableMap;
     }
 
-    public Map<Long, String> getColumnNameMap() {
-        Map<Long, String> columnMap = new HashMap<>();
+    public Map<Long, GenTableColumn> getColumnMap() {
+        Map<Long, GenTableColumn> columnMap = new HashMap<>();
         List<GenTable> genTables = getAllGenTables();
-        for(GenTable genTable : genTables){
-            for(GenTableColumn genTableColumn : genTable.getColumns()){
-                columnMap.put(genTableColumn.getColumnId(), genTableColumn.getColumnName());
+        for (GenTable genTable : genTables) {
+            for (GenTableColumn genTableColumn : genTable.getColumns()) {
+                columnMap.put(genTableColumn.getColumnId(), genTableColumn);
             }
         }
         return columnMap;
diff --git a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index afeb86e..06d1179 100644
--- a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -64,9 +64,9 @@ public class VelocityUtils
         velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
-        velocityContext.put("tableNameMap", genTableVo.getTableNameMap());
+        velocityContext.put("tableMap", genTableVo.getTableMap());
         velocityContext.put("tableAliasMap", genTableVo.getTableAliasMap());
-        velocityContext.put("columnNameMap", genTableVo.getColumnNameMap());
+        velocityContext.put("columnMap", genTableVo.getColumnMap());
         velocityContext.put("allColumns", genTableVo.getAllGenTableColumns());
         velocityContext.put("joinColunms", genTableVo.getJoinColumns());
         velocityContext.put("joinTablesMate", genTableVo.getJoinTablesMate());
diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index 6dd7fc5..cc5ead7 100644
--- a/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -30,12 +30,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="select${ClassName}Vo">
         select 
 #foreach ($column in $allColumns)
-            $tableAliasMap[$column.tableId].$columnNameMap[$column.columnId]#if($foreach.hasNext),#end
+#set($columnName=$columnMap[$column.columnId].columnName)
+#set($tableAlias=$tableAliasMap[$column.tableId])
+            $tableAlias.$columnName#if($foreach.hasNext),#end
 #end
-        from $tableNameMap[$table.tableId] $tableAliasMap[$table.tableId]
+        from $table.tableName $table.tableAlias
 #if($joinTablesMate)
 #foreach($joinTable in $joinTablesMate)
-        ${joinTable.joinType} join $tableNameMap[$joinTable.rightTableId] ${joinTable.rightTableAlias} on ${joinTable.rightTableAlias}.$columnNameMap[$joinTable.rightTableFk] = ${joinTable.leftTableAlias}.$columnNameMap[$joinTable.leftTableFk]
+#set($leftColumnName=$columnMap[$joinTable.leftTableFk].columnName)
+#set($leftTableAlias=$joinTable.leftTableAlias)
+#set($rightColumnName=$columnMap[$joinTable.rightTableFk].columnName)
+#set($rightTableAlias=$joinTable.rightTableAlias)
+#set($newTableName=$tableMap[$joinTable.newTableId].tableName)
+#set($newTableAlias=$tableAliasMap[$joinTable.newTableId])
+        ${joinTable.joinType} join $newTableName $newTableAlias on $rightTableAlias.$rightColumnName = $leftTableAlias.$leftColumnName
 #end
 #end
     </sql>
@@ -43,57 +51,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
         <include refid="select${ClassName}Vo"/>
         <where>
-#foreach($column in $columns)
+#foreach($column in $allColumns)
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
 #set($javaType=$column.javaType)
-#set($columnName=$columnNameMap[$column.columnId])
+#set($columnName=$columnMap[$column.columnId].columnName)
+#set($tableAlias=$tableAliasMap[$column.tableId])
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #if($column.query)
 #if($column.queryType == "EQ")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName = #{$javaField}</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName = #{$javaField}</if>
 #elseif($queryType == "NE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName != #{$javaField}</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName != #{$javaField}</if>
 #elseif($queryType == "GT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName &gt; #{$javaField}</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName &gt; #{$javaField}</if>
 #elseif($queryType == "GTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName &gt;= #{$javaField}</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName &gt;= #{$javaField}</if>
 #elseif($queryType == "LT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName &lt; #{$javaField}</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName &lt; #{$javaField}</if>
 #elseif($queryType == "LTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName &lt;= #{$javaField}</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName &lt;= #{$javaField}</if>
 #elseif($queryType == "LIKE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$table.tableId].$columnName like concat('%', #{$javaField}, '%')</if>
+            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAlias.$columnName like concat('%', #{$javaField}, '%')</if>
 #elseif($queryType == "BETWEEN")
-            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $tableAliasMap[$table.tableId].$columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
-#end
-#end
-#if($joinColunms)
-#foreach($column in $joinColunms)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$columnNameMap[$column.columnId])
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName = #{$javaField}</if>
-#elseif($queryType == "NE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName != #{$javaField}</if>
-#elseif($queryType == "GT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName &gt; #{$javaField}</if>
-#elseif($queryType == "GTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName &gt;= #{$javaField}</if>
-#elseif($queryType == "LT")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName &lt; #{$javaField}</if>
-#elseif($queryType == "LTE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName &lt;= #{$javaField}</if>
-#elseif($queryType == "LIKE")
-            <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and $tableAliasMap[$column.tableId].$columnName like concat('%', #{$javaField}, '%')</if>
-#elseif($queryType == "BETWEEN")
-            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $tableAliasMap[$column.tableId].$columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
-#end
+            <if test="params.begin$AttrName != null and params.begin$AttrName != '' and params.end$AttrName != null and params.end$AttrName != ''"> and $tableAlias.$columnName between #{params.begin$AttrName} and #{params.end$AttrName}</if>
 #end
 #end
 #end