From a6fb88d74c20cc28043d75e8a5097fce49cf9a78 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 15:19:42 +0800
Subject: [PATCH] update [重大更新]全业务 增加 接口文档注解 格式化代码
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 279 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 162 insertions(+), 117 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 42e4984..0a3ffbc 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
@@ -1,36 +1,47 @@
package com.ruoyi.generator.util;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import org.apache.velocity.VelocityContext;
-import com.alibaba.fastjson.JSONObject;
+import cn.hutool.core.convert.Convert;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
+import org.apache.velocity.VelocityContext;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
/**
- * 浠ｇ爜鐢熸垚妯℃澘澶勭悊
- *
+ * 妯℃澘澶勭悊宸ュ叿绫�
+ *
* @author ruoyi
*/
-public class VelocityUtils
-{
- /** 椤圭洰绌洪棿璺緞 */
+public class VelocityUtils {
+
+ /**
+ * 椤圭洰绌洪棿璺緞
+ */
private static final String PROJECT_PATH = "main/java";
- /** mybatis绌洪棿璺緞 */
+ /**
+ * 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)
- {
+ public static VelocityContext prepareContext(GenTable genTable) {
String moduleName = genTable.getModuleName();
String businessName = genTable.getBusinessName();
String packageName = genTable.getPackageName();
@@ -51,21 +62,31 @@
velocityContext.put("author", genTable.getFunctionAuthor());
velocityContext.put("datetime", DateUtils.getDate());
velocityContext.put("pkColumn", genTable.getPkColumn());
- velocityContext.put("importList", getImportList(genTable.getColumns()));
+ velocityContext.put("importList", getImportList(genTable));
velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
velocityContext.put("columns", genTable.getColumns());
velocityContext.put("table", genTable);
- if (GenConstants.TPL_TREE.equals(tplCategory))
- {
+ velocityContext.put("dicts", getDicts(genTable));
+ setMenuVelocityContext(velocityContext, genTable);
+ if (GenConstants.TPL_TREE.equals(tplCategory)) {
setTreeVelocityContext(velocityContext, genTable);
+ }
+ if (GenConstants.TPL_SUB.equals(tplCategory)) {
+ setSubVelocityContext(velocityContext, genTable);
}
return velocityContext;
}
- public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
- {
+ public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions();
- JSONObject paramsObj = JSONObject.parseObject(options);
+ Map<String, Object> 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);
String treeCode = getTreecode(paramsObj);
String treeParentCode = getTreeParentCode(paramsObj);
String treeName = getTreeName(paramsObj);
@@ -74,25 +95,41 @@
context.put("treeParentCode", treeParentCode);
context.put("treeName", treeName);
context.put("expandColumn", getExpandColumn(genTable));
- if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
- {
- context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+ if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+ context.put("tree_parent_code", paramsObj.get(GenConstants.TREE_PARENT_CODE));
}
- if (paramsObj.containsKey(GenConstants.TREE_NAME))
- {
- context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME));
+ if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
+ context.put("tree_name", paramsObj.get(GenConstants.TREE_NAME));
}
+ }
+
+ public static void setSubVelocityContext(VelocityContext context, GenTable genTable) {
+ GenTable subTable = genTable.getSubTable();
+ String subTableName = genTable.getSubTableName();
+ String subTableFkName = genTable.getSubTableFkName();
+ String subClassName = genTable.getSubTable().getClassName();
+ String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
+
+ context.put("subTable", subTable);
+ context.put("subTableName", subTableName);
+ context.put("subTableFkName", subTableFkName);
+ context.put("subTableFkClassName", subTableFkClassName);
+ context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName));
+ context.put("subClassName", subClassName);
+ context.put("subclassName", StringUtils.uncapitalize(subClassName));
+ context.put("subImportList", getImportList(genTable.getSubTable()));
}
/**
* 鑾峰彇妯℃澘淇℃伅
- *
+ *
* @return 妯℃澘鍒楄〃
*/
- public static List<String> getTemplateList(String tplCategory)
- {
+ public static List<String> getTemplateList(String tplCategory) {
List<String> templates = new ArrayList<String>();
templates.add("vm/java/domain.java.vm");
+ templates.add("vm/java/vo.java.vm");
+ templates.add("vm/java/bo.java.vm");
templates.add("vm/java/mapper.java.vm");
templates.add("vm/java/service.java.vm");
templates.add("vm/java/serviceImpl.java.vm");
@@ -100,13 +137,13 @@
templates.add("vm/xml/mapper.xml.vm");
templates.add("vm/sql/sql.vm");
templates.add("vm/js/api.js.vm");
- if (GenConstants.TPL_CRUD.equals(tplCategory))
- {
+ if (GenConstants.TPL_CRUD.equals(tplCategory)) {
templates.add("vm/vue/index.vue.vm");
- }
- else if (GenConstants.TPL_TREE.equals(tplCategory))
- {
+ } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
templates.add("vm/vue/index-tree.vue.vm");
+ } else if (GenConstants.TPL_SUB.equals(tplCategory)) {
+ templates.add("vm/vue/index.vue.vm");
+ templates.add("vm/java/sub-domain.java.vm");
}
return templates;
}
@@ -114,8 +151,7 @@
/**
* 鑾峰彇鏂囦欢鍚�
*/
- public static String getFileName(String template, GenTable genTable)
- {
+ public static String getFileName(String template, GenTable genTable) {
// 鏂囦欢鍚嶇О
String fileName = "";
// 鍖呰矾寰�
@@ -131,44 +167,34 @@
String mybatisPath = MYBATIS_PATH + "/" + moduleName;
String vuePath = "vue";
- if (template.contains("domain.java.vm"))
- {
+ if (template.contains("domain.java.vm")) {
fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
}
- else if (template.contains("mapper.java.vm"))
- {
+ if (template.contains("vo.java.vm")) {
+ fileName = StringUtils.format("{}/domain/vo/{}Vo.java", javaPath, className);
+ }
+ if (template.contains("bo.java.vm")) {
+ fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className);
+ }
+ if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) {
+ fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
+ } else if (template.contains("mapper.java.vm")) {
fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
- }
- else if (template.contains("service.java.vm"))
- {
+ } else if (template.contains("service.java.vm")) {
fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
- }
- else if (template.contains("serviceImpl.java.vm"))
- {
+ } else if (template.contains("serviceImpl.java.vm")) {
fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
- }
- else if (template.contains("controller.java.vm"))
- {
+ } else if (template.contains("controller.java.vm")) {
fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
- }
- else if (template.contains("mapper.xml.vm"))
- {
+ } else if (template.contains("mapper.xml.vm")) {
fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
- }
- else if (template.contains("sql.vm"))
- {
+ } else if (template.contains("sql.vm")) {
fileName = businessName + "Menu.sql";
- }
- else if (template.contains("api.js.vm"))
- {
+ } else if (template.contains("api.js.vm")) {
fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
- }
- else if (template.contains("index.vue.vm"))
- {
+ } else if (template.contains("index.vue.vm")) {
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
- }
- else if (template.contains("index-tree.vue.vm"))
- {
+ } else if (template.contains("index-tree.vue.vm")) {
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
}
return fileName;
@@ -176,12 +202,11 @@
/**
* 鑾峰彇鍖呭墠缂�
- *
+ *
* @param packageName 鍖呭悕绉�
* @return 鍖呭墠缂�鍚嶇О
*/
- public static String getPackagePrefix(String packageName)
- {
+ public static String getPackagePrefix(String packageName) {
int lastIndex = packageName.lastIndexOf(".");
String basePackage = StringUtils.substring(packageName, 0, lastIndex);
return basePackage;
@@ -189,22 +214,22 @@
/**
* 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘
- *
- * @param column 鍒楅泦鍚�
+ *
+ * @param genTable 涓氬姟琛ㄥ璞�
* @return 杩斿洖闇�瑕佸鍏ョ殑鍖呭垪琛�
*/
- public static HashSet<String> getImportList(List<GenTableColumn> columns)
- {
+ public static HashSet<String> getImportList(GenTable genTable) {
+ List<GenTableColumn> columns = genTable.getColumns();
+ GenTable subGenTable = genTable.getSubTable();
HashSet<String> importList = new HashSet<String>();
- for (GenTableColumn column : columns)
- {
- if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
- {
+ if (StringUtils.isNotNull(subGenTable)) {
+ importList.add("java.util.List");
+ }
+ for (GenTableColumn column : columns) {
+ if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
importList.add("java.util.Date");
importList.add("com.fasterxml.jackson.annotation.JsonFormat");
- }
- else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
- {
+ } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) {
importList.add("java.math.BigDecimal");
}
}
@@ -212,83 +237,103 @@
}
/**
+ * 鏍规嵁鍒楃被鍨嬭幏鍙栧瓧鍏哥粍
+ *
+ * @param genTable 涓氬姟琛ㄥ璞�
+ * @return 杩斿洖瀛楀吀缁�
+ */
+ public static String getDicts(GenTable genTable) {
+ List<GenTableColumn> columns = genTable.getColumns();
+ List<String> dicts = new ArrayList<String>();
+ for (GenTableColumn column : columns) {
+ if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
+ column.getHtmlType(), new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO})) {
+ dicts.add("'" + column.getDictType() + "'");
+ }
+ }
+ return StringUtils.join(dicts, ", ");
+ }
+
+ /**
* 鑾峰彇鏉冮檺鍓嶇紑
- *
- * @param moduleName 妯″潡鍚嶇О
+ *
+ * @param moduleName 妯″潡鍚嶇О
* @param businessName 涓氬姟鍚嶇О
* @return 杩斿洖鏉冮檺鍓嶇紑
*/
- public static String getPermissionPrefix(String moduleName, String businessName)
- {
+ public static String getPermissionPrefix(String moduleName, String businessName) {
return StringUtils.format("{}:{}", moduleName, businessName);
+ }
+ /**
+ * 鑾峰彇涓婄骇鑿滃崟ID瀛楁
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
+ * @return 涓婄骇鑿滃崟ID瀛楁
+ */
+ public static String getParentMenuId(Map<String, Object> paramsObj) {
+ if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+ && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) {
+ return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
+ }
+ return DEFAULT_PARENT_MENU_ID;
}
/**
* 鑾峰彇鏍戠紪鐮�
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠紪鐮�
*/
- public static String getTreecode(JSONObject paramsObj)
- {
- if (paramsObj.containsKey(GenConstants.TREE_CODE))
- {
- return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
+ public static String getTreecode(Map<String, Object> paramsObj) {
+ if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) {
+ return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
}
- return "";
+ return StringUtils.EMPTY;
}
/**
* 鑾峰彇鏍戠埗缂栫爜
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠埗缂栫爜
*/
- public static String getTreeParentCode(JSONObject paramsObj)
- {
- if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
- {
- return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+ public static String getTreeParentCode(Map<String, Object> paramsObj) {
+ if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+ return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
}
- return "";
+ return StringUtils.EMPTY;
}
/**
* 鑾峰彇鏍戝悕绉�
- *
- * @param options 鐢熸垚鍏朵粬閫夐」
+ *
+ * @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戝悕绉�
*/
- public static String getTreeName(JSONObject paramsObj)
- {
- if (paramsObj.containsKey(GenConstants.TREE_NAME))
- {
- return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
+ public static String getTreeName(Map<String, Object> paramsObj) {
+ if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) {
+ return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
}
- return "";
+ return StringUtils.EMPTY;
}
/**
* 鑾峰彇闇�瑕佸湪鍝竴鍒椾笂闈㈡樉绀哄睍寮�鎸夐挳
- *
+ *
* @param genTable 涓氬姟琛ㄥ璞�
* @return 灞曞紑鎸夐挳鍒楀簭鍙�
*/
- public static int getExpandColumn(GenTable genTable)
- {
+ public static int getExpandColumn(GenTable genTable) {
String options = genTable.getOptions();
- JSONObject paramsObj = JSONObject.parseObject(options);
- String treeName = paramsObj.getString(GenConstants.TREE_NAME);
+ Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+ String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
int num = 0;
- for (GenTableColumn column : genTable.getColumns())
- {
- if (column.isList())
- {
+ for (GenTableColumn column : genTable.getColumns()) {
+ if (column.isList()) {
num++;
String columnName = column.getColumnName();
- if (columnName.equals(treeName))
- {
+ if (columnName.equals(treeName)) {
break;
}
}
--
Gitblit v1.9.3