|
|
|
@ -7,7 +7,7 @@ import org.apache.velocity.VelocityContext;
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.ruoyi.common.constant.GenConstants;
|
|
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
|
import com.ruoyi.common.utils.StringPlusUtils;
|
|
|
|
|
import com.ruoyi.generator.domain.GenTable;
|
|
|
|
|
import com.ruoyi.generator.domain.GenTableColumn;
|
|
|
|
|
|
|
|
|
@ -43,11 +43,11 @@ public class VelocityUtils
|
|
|
|
|
VelocityContext velocityContext = new VelocityContext();
|
|
|
|
|
velocityContext.put("tplCategory", genTable.getTplCategory());
|
|
|
|
|
velocityContext.put("tableName", genTable.getTableName());
|
|
|
|
|
velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
|
|
|
|
|
velocityContext.put("functionName", StringPlusUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
|
|
|
|
|
velocityContext.put("ClassName", genTable.getClassName());
|
|
|
|
|
velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
|
|
|
|
|
velocityContext.put("className", StringPlusUtils.uncapitalize(genTable.getClassName()));
|
|
|
|
|
velocityContext.put("moduleName", genTable.getModuleName());
|
|
|
|
|
velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
|
|
|
|
|
velocityContext.put("BusinessName", StringPlusUtils.capitalize(genTable.getBusinessName()));
|
|
|
|
|
velocityContext.put("businessName", genTable.getBusinessName());
|
|
|
|
|
velocityContext.put("basePackage", getPackagePrefix(packageName));
|
|
|
|
|
velocityContext.put("packageName", packageName);
|
|
|
|
@ -106,15 +106,15 @@ public class VelocityUtils
|
|
|
|
|
String subTableName = genTable.getSubTableName();
|
|
|
|
|
String subTableFkName = genTable.getSubTableFkName();
|
|
|
|
|
String subClassName = genTable.getSubTable().getClassName();
|
|
|
|
|
String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName);
|
|
|
|
|
String subTableFkClassName = StringPlusUtils.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("subTableFkclassName", StringPlusUtils.uncapitalize(subTableFkClassName));
|
|
|
|
|
context.put("subClassName", subClassName);
|
|
|
|
|
context.put("subclassName", StringUtils.uncapitalize(subClassName));
|
|
|
|
|
context.put("subclassName", StringPlusUtils.uncapitalize(subClassName));
|
|
|
|
|
context.put("subImportList", getImportList(genTable.getSubTable()));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -166,37 +166,37 @@ public class VelocityUtils
|
|
|
|
|
// 业务名称
|
|
|
|
|
String businessName = genTable.getBusinessName();
|
|
|
|
|
|
|
|
|
|
String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
|
|
|
|
|
String javaPath = PROJECT_PATH + "/" + StringPlusUtils.replace(packageName, ".", "/");
|
|
|
|
|
String mybatisPath = MYBATIS_PATH + "/" + moduleName;
|
|
|
|
|
String vuePath = "vue";
|
|
|
|
|
|
|
|
|
|
if (template.contains("domain.java.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/domain/{}.java", javaPath, className);
|
|
|
|
|
}
|
|
|
|
|
if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
|
|
|
|
|
if (template.contains("sub-domain.java.vm") && StringPlusUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
|
|
|
|
|
fileName = StringPlusUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("mapper.java.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("service.java.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/service/I{}Service.java", javaPath, className);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("serviceImpl.java.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("controller.java.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/controller/{}Controller.java", javaPath, className);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("mapper.xml.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/{}Mapper.xml", mybatisPath, className);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("sql.vm"))
|
|
|
|
|
{
|
|
|
|
@ -204,15 +204,15 @@ public class VelocityUtils
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("api.js.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("index.vue.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
|
|
|
|
|
}
|
|
|
|
|
else if (template.contains("index-tree.vue.vm"))
|
|
|
|
|
{
|
|
|
|
|
fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
|
|
|
|
|
fileName = StringPlusUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
|
|
|
|
|
}
|
|
|
|
|
return fileName;
|
|
|
|
|
}
|
|
|
|
@ -226,7 +226,7 @@ public class VelocityUtils
|
|
|
|
|
public static String getPackagePrefix(String packageName)
|
|
|
|
|
{
|
|
|
|
|
int lastIndex = packageName.lastIndexOf(".");
|
|
|
|
|
String basePackage = StringUtils.substring(packageName, 0, lastIndex);
|
|
|
|
|
String basePackage = StringPlusUtils.substring(packageName, 0, lastIndex);
|
|
|
|
|
return basePackage;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -241,7 +241,7 @@ public class VelocityUtils
|
|
|
|
|
List<GenTableColumn> columns = genTable.getColumns();
|
|
|
|
|
GenTable subGenTable = genTable.getSubTable();
|
|
|
|
|
HashSet<String> importList = new HashSet<String>();
|
|
|
|
|
if (StringUtils.isNotNull(subGenTable))
|
|
|
|
|
if (StringPlusUtils.isNotNull(subGenTable))
|
|
|
|
|
{
|
|
|
|
|
importList.add("java.util.List");
|
|
|
|
|
}
|
|
|
|
@ -269,7 +269,7 @@ public class VelocityUtils
|
|
|
|
|
*/
|
|
|
|
|
public static String getPermissionPrefix(String moduleName, String businessName)
|
|
|
|
|
{
|
|
|
|
|
return StringUtils.format("{}:{}", moduleName, businessName);
|
|
|
|
|
return StringPlusUtils.format("{}:{}", moduleName, businessName);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -280,7 +280,7 @@ public class VelocityUtils
|
|
|
|
|
*/
|
|
|
|
|
public static String getParentMenuId(JSONObject paramsObj)
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
|
|
|
|
|
if (StringPlusUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
|
|
|
|
|
{
|
|
|
|
|
return paramsObj.getString(GenConstants.PARENT_MENU_ID);
|
|
|
|
|
}
|
|
|
|
@ -297,9 +297,9 @@ public class VelocityUtils
|
|
|
|
|
{
|
|
|
|
|
if (paramsObj.containsKey(GenConstants.TREE_CODE))
|
|
|
|
|
{
|
|
|
|
|
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
|
|
|
|
|
return StringPlusUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
|
|
|
|
|
}
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
|
return StringPlusUtils.EMPTY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -312,9 +312,9 @@ public class VelocityUtils
|
|
|
|
|
{
|
|
|
|
|
if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
|
|
|
|
|
{
|
|
|
|
|
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
|
|
|
|
|
return StringPlusUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
|
|
|
|
|
}
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
|
return StringPlusUtils.EMPTY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -327,9 +327,9 @@ public class VelocityUtils
|
|
|
|
|
{
|
|
|
|
|
if (paramsObj.containsKey(GenConstants.TREE_NAME))
|
|
|
|
|
{
|
|
|
|
|
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
|
|
|
|
|
return StringPlusUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
|
|
|
|
|
}
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
|
return StringPlusUtils.EMPTY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|