From 68a23c49184f575e9abcc3554b6c3d6d829d9737 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 14 二月 2022 16:02:22 +0800
Subject: [PATCH] update 优化代码生成

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java |   24 ++++++------
 ruoyi-generator/src/main/resources/vm/java/service.java.vm                |   38 ++++++++++++------
 ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm            |   42 +++++++++++++++++++-
 3 files changed, 76 insertions(+), 28 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 f5fbdb2..3c25b11 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
@@ -78,14 +78,14 @@
 
     public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
         String options = genTable.getOptions();
-        Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+        Map<String, String> paramsObj = JsonUtils.parseMap(options);
         String parentMenuId = getParentMenuId(paramsObj);
         context.put("parentMenuId", parentMenuId);
     }
 
     public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
         String options = genTable.getOptions();
-        Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+        Map<String, String> paramsObj = JsonUtils.parseMap(options);
         String treeCode = getTreecode(paramsObj);
         String treeParentCode = getTreeParentCode(paramsObj);
         String treeName = getTreeName(paramsObj);
@@ -270,9 +270,9 @@
      * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 涓婄骇鑿滃崟ID瀛楁
      */
-    public static String getParentMenuId(Map<String, Object> paramsObj) {
+    public static String getParentMenuId(Map<String, String> paramsObj) {
         if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
-            && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) {
+            && StringUtils.isNotEmpty(paramsObj.get(GenConstants.PARENT_MENU_ID))) {
             return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
         }
         return DEFAULT_PARENT_MENU_ID;
@@ -284,9 +284,9 @@
      * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠紪鐮�
      */
-    public static String getTreecode(Map<String, Object> paramsObj) {
+    public static String getTreecode(Map<String, String> paramsObj) {
         if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) {
-            return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
+            return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_CODE));
         }
         return StringUtils.EMPTY;
     }
@@ -297,9 +297,9 @@
      * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戠埗缂栫爜
      */
-    public static String getTreeParentCode(Map<String, Object> paramsObj) {
+    public static String getTreeParentCode(Map<String, String> paramsObj) {
         if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
-            return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
+            return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_PARENT_CODE));
         }
         return StringUtils.EMPTY;
     }
@@ -310,9 +310,9 @@
      * @param paramsObj 鐢熸垚鍏朵粬閫夐」
      * @return 鏍戝悕绉�
      */
-    public static String getTreeName(Map<String, Object> paramsObj) {
+    public static String getTreeName(Map<String, String> paramsObj) {
         if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) {
-            return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
+            return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_NAME));
         }
         return StringUtils.EMPTY;
     }
@@ -325,8 +325,8 @@
      */
     public static int getExpandColumn(GenTable genTable) {
         String options = genTable.getOptions();
-        Map<String, Object> paramsObj = JsonUtils.parseMap(options);
-        String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
+        Map<String, String> paramsObj = JsonUtils.parseMap(options);
+        String treeName = paramsObj.get(GenConstants.TREE_NAME);
         int num = 0;
         for (GenTableColumn column : genTable.getColumns()) {
             if (column.isList()) {
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 4a3eb56..309328c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -18,43 +18,55 @@
  * @date ${datetime}
  */
 public interface I${ClassName}Service {
+
     /**
-     * 鏌ヨ鍗曚釜
-     * @return
+     * 鏌ヨ${functionName}
+     *
+     * @param ${pkColumn.javaField} ${functionName}涓婚敭
+     * @return ${functionName}
      */
     ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
 
 #if($table.crud || $table.sub)
     /**
-     * 鏌ヨ鍒楄〃
+     * 鏌ヨ${functionName}鍒楄〃
+     *
+     * @param ${className} ${functionName}
+     * @return ${functionName}闆嗗悎
      */
     TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
 #end
 
     /**
-     * 鏌ヨ鍒楄〃
+     * 鏌ヨ${functionName}鍒楄〃
+     *
+     * @param ${className} ${functionName}
+     * @return ${functionName}闆嗗悎
      */
     List<${ClassName}Vo> queryList(${ClassName}Bo bo);
 
     /**
-     * 鏍规嵁鏂板涓氬姟瀵硅薄鎻掑叆${functionName}
-     * @param bo ${functionName}鏂板涓氬姟瀵硅薄
-     * @return
+     * 淇敼${functionName}
+     *
+     * @param ${className} ${functionName}
+     * @return 缁撴灉
      */
     Boolean insertByBo(${ClassName}Bo bo);
 
     /**
-     * 鏍规嵁缂栬緫涓氬姟瀵硅薄淇敼${functionName}
-     * @param bo ${functionName}缂栬緫涓氬姟瀵硅薄
-     * @return
+     * 淇敼${functionName}
+     *
+     * @param ${className} ${functionName}
+     * @return 缁撴灉
      */
     Boolean updateByBo(${ClassName}Bo bo);
 
     /**
-     * 鏍￠獙骞跺垹闄ゆ暟鎹�
-     * @param ids 涓婚敭闆嗗悎
+     * 鏍￠獙骞舵壒閲忓垹闄�${functionName}淇℃伅
+     *
+     * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭闆嗗悎
      * @param isValid 鏄惁鏍￠獙,true-鍒犻櫎鍓嶆牎楠�,false-涓嶆牎楠�
-     * @return
+     * @return 缁撴灉
      */
     Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 2d49171..83a8f42 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -5,12 +5,12 @@
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
-#end
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+#end
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
 import ${packageName}.domain.bo.${ClassName}Bo;
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.${ClassName};
@@ -33,12 +33,24 @@
 
     private final ${ClassName}Mapper baseMapper;
 
+    /**
+     * 鏌ヨ${functionName}
+     *
+     * @param ${pkColumn.javaField} ${functionName}涓婚敭
+     * @return ${functionName}
+     */
     @Override
     public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
         return baseMapper.selectVoById(${pkColumn.javaField});
     }
 
 #if($table.crud || $table.sub)
+    /**
+     * 鏌ヨ${functionName}鍒楄〃
+     *
+     * @param ${className} ${functionName}
+     * @return ${functionName}
+     */
     @Override
     public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
@@ -47,6 +59,12 @@
     }
 #end
 
+    /**
+     * 鏌ヨ${functionName}鍒楄〃
+     *
+     * @param ${className} ${functionName}
+     * @return ${functionName}
+     */
     @Override
     public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
         LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
@@ -80,6 +98,12 @@
         return lqw;
     }
 
+    /**
+     * 鏂板${functionName}
+     *
+     * @param ${className} ${functionName}
+     * @return 缁撴灉
+     */
     @Override
     public Boolean insertByBo(${ClassName}Bo bo) {
         ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class);
@@ -92,6 +116,12 @@
         return flag;
     }
 
+    /**
+     * 淇敼${functionName}
+     *
+     * @param ${className} ${functionName}
+     * @return 缁撴灉
+     */
     @Override
     public Boolean updateByBo(${ClassName}Bo bo) {
         ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class);
@@ -108,6 +138,12 @@
         //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
     }
 
+    /**
+     * 鎵归噺鍒犻櫎${functionName}
+     *
+     * @param ${pkColumn.javaField}s 闇�瑕佸垹闄ょ殑${functionName}涓婚敭
+     * @return 缁撴灉
+     */
     @Override
     public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
         if(isValid){

--
Gitblit v1.9.3