wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-27 20:21:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化代码生成细节

Browse Source
This commit is contained in:
AlanScipio
2024-02-05 18:31:38 +08:00
parent 636e3bce52
commit 6b6658f9a1
18 changed files with 607 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java
View File

@@ -5,62 +5,61 @@ import org.springframework.stereotype.Component;
/**
* 代码生成相关配置
*
*
* @author ruoyi
*/
@Component
@ConfigurationProperties(prefix = "gen")
public class GenConfig
{
/** 作者 */
public class GenConfig {
/**
* 作者
*/
public static String author;
/** 生成包路径 */
/**
* 生成包路径
*/
public static String packageName;
/** 自动去除表前缀，默认是false */
/**
* 自动去除表前缀，默认是false
*/
public static boolean autoRemovePre;
/** 表前缀(类名不会包含表前缀) */
/**
* 表前缀(类名不会包含表前缀)
*/
public static String tablePrefix;
public static String getAuthor()
{
public static String getAuthor() {
return author;
}
public void setAuthor(String author)
{
public void setAuthor(String author) {
GenConfig.author = author;
}
public static String getPackageName()
{
public static String getPackageName() {
return packageName;
}
public void setPackageName(String packageName)
{
public void setPackageName(String packageName) {
GenConfig.packageName = packageName;
}
public static boolean getAutoRemovePre()
{
public static boolean getAutoRemovePre() {
return autoRemovePre;
}
public void setAutoRemovePre(boolean autoRemovePre)
{
public void setAutoRemovePre(boolean autoRemovePre) {
GenConfig.autoRemovePre = autoRemovePre;
}
public static String getTablePrefix()
{
public static String getTablePrefix() {
return tablePrefix;
}
public void setTablePrefix(String tablePrefix)
{
public void setTablePrefix(String tablePrefix) {
GenConfig.tablePrefix = tablePrefix;
}
}

2
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm
View File

@@ -17,7 +17,7 @@ public interface I${ClassName}Service {
* @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName}
*/
${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
/**
* 查询${functionName}列表

88
ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl-dynamic.java.vm
View File

@@ -11,14 +11,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.mybatis.dynamic.sql.where.condition.IsEqualTo;
import org.mybatis.dynamic.sql.where.condition.IsIn;
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
import org.mybatis.dynamic.sql.SqlBuilder;
import org.mybatis.dynamic.sql.render.RenderingStrategies;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
#if($table.sub)
import java.util.ArrayList;
import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.transaction.annotation.Transactional;
import ${packageName}.domain.${subClassName};
#end
import com.ruoyi.common.core.web.domain.ExtBaseEntity;
import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName};
import ${packageName}.mapper.${ClassName}DynamicSqlSupport;
@@ -61,45 +64,41 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
@Override
public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
{
## return ${className}Mapper.select(SelectDSLCompleter.allRows()); //查询全部字段
#set ($whereFuncName = "where")
SelectStatementProvider provider = SqlBuilder.select(${ClassName}Mapper.selectList)
.from(${ClassName}DynamicSqlSupport.${className})
.where(${ClassName}DynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE))
#set ($conditionFuncName = "isEqualToWhenPresent")
return unitInfoMapper.select(dsl -> dsl
#foreach ($column in $columns)
## where语句是where还是and开头
#if (!$foreach.first)
#set ($whereFuncName = "and")
#end
## 查询条件
#if ($columne.queryType == "EQ")
#set ($conditionFuncName = "isEqualToWhenPresent")
#elseif ($columne.queryType == "NE")
#set ($conditionFuncName = "isNotEqualToWhenPresent")
#elseif ($columne.queryType == "GT")
#set ($conditionFuncName = "isGreaterThanWhenPresent")
#elseif ($columne.queryType == "GTE")
#set ($conditionFuncName = "isGreaterThanOrEqualToWhenPresent")
#elseif ($columne.queryType == "LT")
#set ($conditionFuncName = "isLessThanWhenPresent")
#elseif ($columne.queryType == "LTE")
#set ($conditionFuncName = "isLessThanOrEqualToWhenPresent")
#elseif ($columne.queryType == "LIKE")
#set ($conditionFuncName = "isLikeWhenPresent")
#elseif ($columne.queryType == "BETWEEN")
#set ($conditionFuncName = "isBetweenWhenPresent")
## #elseif ($columne.queryType == "IN")
## #set ($conditionFuncName = "isIn")
## #elseif ($columne.queryType == "NI")
## #set ($conditionFuncName = "isNotIn")
#end
## 对like条件的特殊处理
#if ($columne.queryType == "LIKE")
.${whereFuncName}(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}() == null ? null : "%" + ${className}.get${column.javaFieldUpper}() + "%")
#else
.${whereFuncName}(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}()))
#if ($column.isQuery == "1")
## 查询条件
#if ($column.queryType == "EQ")
#set ($conditionFuncName = "isEqualToWhenPresent")
#elseif ($column.queryType == "NE")
#set ($conditionFuncName = "isNotEqualToWhenPresent")
#elseif ($column.queryType == "GT")
#set ($conditionFuncName = "isGreaterThanWhenPresent")
#elseif ($column.queryType == "GTE")
#set ($conditionFuncName = "isGreaterThanOrEqualToWhenPresent")
#elseif ($column.queryType == "LT")
#set ($conditionFuncName = "isLessThanWhenPresent")
#elseif ($column.queryType == "LTE")
#set ($conditionFuncName = "isLessThanOrEqualToWhenPresent")
#elseif ($column.queryType == "LIKE")
#set ($conditionFuncName = "isLikeWhenPresent")
#else
#set ($conditionFuncName = "isEqualToWhenPresent")
#end
## 对like条件的特殊处理
#if ($column.queryType == "LIKE")
.and(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}() == null ? null : "%" + ${className}.get${column.javaFieldUpper}() + "%")
#else
.and(${ClassName}DynamicSqlSupport.$column.javaField, SqlBuilder.${conditionFuncName}(${className}.get${column.javaFieldUpper}()))
#end
#end
#end
);
.build()
.render(RenderingStrategies.MYBATIS3);
return ${className}Mapper.selectMany(provider);
}
/**
@@ -167,8 +166,14 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
#end
return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isIn(${pkColumn.javaField}s)));
## return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isIn(${pkColumn.javaField}s)));
UpdateStatementProvider provider = SqlBuilder.update(UnitInfoDynamicSqlSupport.${className})
.set(${ClassName}DynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
.set(${ClassName}DynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
.where(${ClassName}DynamicSqlSupport.unitCode, SqlBuilder.isIn(${pkColumn.javaField}s))
.build()
.render(RenderingStrategies.MYBATIS3);
return ${className}Mapper.update(provider);
}
/**
@@ -186,7 +191,12 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
#if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
#end
return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isEqualTo(${pkColumn.javaField})));
## return ${className}Mapper.delete(dsl -> dsl.where(${ClassName}DynamicSqlSupport.${pkColumn.javaField}, SqlBuilder.isEqualTo(${pkColumn.javaField})));
${ClassName} record = new ${ClassName}();
record.set${pkColumn.capJavaField}(${pkColumn.javaField});
record.setDeleteFlag(ExtBaseEntity.DELETED);
record.setUpdateTime(DateUtils.getNowDate());
return ${className}Mapper.updateByPrimaryKey(record);
}
#if($table.sub)

5
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
View File

@@ -282,7 +282,7 @@ const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
const ${businessName}List = ref([]);
const ${businessName}Options = ref([]);
const open = ref(false);
const loading = ref(true);
const loading = ref(false);
const showSearch = ref(true);
const title = ref("");
const isExpandAll = ref(true);
@@ -470,5 +470,6 @@ function handleDelete(row) {
}).catch(() => {});
}
getList();
//页面打开时查询
//getList();
</script>

5
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
View File

@@ -356,7 +356,7 @@ const ${businessName}List = ref([]);
const ${subclassName}List = ref([]);
#end
const open = ref(false);
const loading = ref(true);
const loading = ref(false);
const showSearch = ref(true);
const ids = ref([]);
#if($table.sub)
@@ -586,5 +586,6 @@ function handleExport() {
}, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
}
getList();
//页面打开时查询
//getList();
</script>