From ee4b4de7b1096c346ea02c7b5322af75e8c6835e Mon Sep 17 00:00:00 2001
From: HR.Hu <418836876@qq.com>
Date: 星期四, 23 七月 2020 21:01:18 +0800
Subject: [PATCH] 修复 代码生成器默认mapper路径与默认mapperScan路径不一致的bug

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java |   64 +++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 9ec14c3..ba0da07 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -11,11 +11,6 @@
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 
-/**
- * 浠ｇ爜鐢熸垚妯℃澘澶勭悊
- * 
- * @author ruoyi
- */
 public class VelocityUtils
 {
     /** 椤圭洰绌洪棿璺緞 */
@@ -24,9 +19,12 @@
     /** mybatis绌洪棿璺緞 */
     private static final String MYBATIS_PATH = "main/resources/mapper";
 
+    /** 榛樿涓婄骇鑿滃崟锛岀郴缁熷伐鍏� */
+    private static final String DEFAULT_PARENT_MENU_ID = "3";
+
     /**
      * 璁剧疆妯℃澘鍙橀噺淇℃伅
-     * 
+     *
      * @return 妯℃澘鍒楄〃
      */
     public static VelocityContext prepareContext(GenTable genTable)
@@ -55,11 +53,20 @@
         velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
+        setMenuVelocityContext(velocityContext, genTable);
         if (GenConstants.TPL_TREE.equals(tplCategory))
         {
             setTreeVelocityContext(velocityContext, genTable);
         }
         return velocityContext;
+    }
+
+    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
+    {
+        String options = genTable.getOptions();
+        JSONObject paramsObj = JSONObject.parseObject(options);
+        String parentMenuId = getParentMenuId(paramsObj);
+        context.put("parentMenuId", parentMenuId);
     }
 
     public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
@@ -86,7 +93,7 @@
 
     /**
      * 鑾峰彇妯℃澘淇℃伅
-     * 
+     *
      * @return 妯℃澘鍒楄〃
      */
     public static List<String> getTemplateList(String tplCategory)
@@ -176,7 +183,7 @@
 
     /**
      * 鑾峰彇鍖呭墠缂�
-     * 
+     *
      * @param packageName 鍖呭悕绉�
      * @return 鍖呭墠缂�鍚嶇О
      */
@@ -189,8 +196,8 @@
 
     /**
      * 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘
-     * 
-     * @param column 鍒楅泦鍚�
+     *
+     * @param columns 鍒楅泦鍚�
      * @return 杩斿洖闇�瑕佸鍏ョ殑鍖呭垪琛�
      */
     public static HashSet<String> getImportList(List<GenTableColumn> columns)
@@ -213,7 +220,7 @@
 
     /**
      * 鑾峰彇鏉冮檺鍓嶇紑
-     * 
+     *
      * @param moduleName 妯″潡鍚嶇О
      * @param businessName 涓氬姟鍚嶇О
      * @return 杩斿洖鏉冮檺鍓嶇紑
@@ -225,9 +232,24 @@
     }
 
     /**
+     * 鑾峰彇涓婄骇鑿滃崟ID瀛楁
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
+     * @return 涓婄骇鑿滃崟ID瀛楁
+     */
+    public static String getParentMenuId(JSONObject paramsObj)
+    {
+        if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+        {
+            return paramsObj.getString(GenConstants.PARENT_MENU_ID);
+        }
+        return DEFAULT_PARENT_MENU_ID;
+    }
+
+    /**
      * 鑾峰彇鏍戠紪鐮�
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠紪鐮�
      */
     public static String getTreecode(JSONObject paramsObj)
@@ -236,13 +258,13 @@
         {
             return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
         }
-        return "";
+        return StringUtils.EMPTY;
     }
 
     /**
      * 鑾峰彇鏍戠埗缂栫爜
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠埗缂栫爜
      */
     public static String getTreeParentCode(JSONObject paramsObj)
@@ -251,13 +273,13 @@
         {
             return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
         }
-        return "";
+        return StringUtils.EMPTY;
     }
 
     /**
      * 鑾峰彇鏍戝悕绉�
-     * 
-     * @param options 鐢熸垚鍏朵粬閫夐」
+     *
+     * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戝悕绉�
      */
     public static String getTreeName(JSONObject paramsObj)
@@ -266,12 +288,12 @@
         {
             return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
         }
-        return "";
+        return StringUtils.EMPTY;
     }
 
     /**
      * 鑾峰彇闇�瑕佸湪鍝竴鍒椾笂闈㈡樉绀哄睍寮�鎸夐挳
-     * 
+     *
      * @param genTable 涓氬姟琛ㄥ璞�
      * @return 灞曞紑鎸夐挳鍒楀簭鍙�
      */

--
Gitblit v1.9.3