xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-11 18:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from MuSan-Li/feature_20250807_fix_code_generator

Browse Source 
feat: 代码生成模板优化
This commit is contained in:
evo
2025-08-07 09:03:08 +08:00
committed by GitHub
parent 19d3f018b8 66518925c1
commit 210a9d9b14
7 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
View File

@@ -9,6 +9,8 @@ import jakarta.validation.constraints.*;
#foreach ($import in $importList) #foreach ($import in $importList)
import ${import}; import ${import};
import java.io.Serializable; import java.io.Serializable;
import org.ruoyi.common.core.validate.AddGroup;
import org.ruoyi.common.core.validate.EditGroup;
#end #end
/** /**

8
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View File

@@ -8,7 +8,7 @@ import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import annotation.idempotent.common.org.ruoyi.RepeatSubmit; import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
import org.ruoyi.common.log.annotation.Log; import org.ruoyi.common.log.annotation.Log;
import org.ruoyi.common.web.core.BaseController; import org.ruoyi.common.web.core.BaseController;
import org.ruoyi.core.page.PageQuery; import org.ruoyi.core.page.PageQuery;
@@ -16,10 +16,10 @@ import org.ruoyi.common.core.domain.R;
import org.ruoyi.common.core.validate.AddGroup; import org.ruoyi.common.core.validate.AddGroup;
import org.ruoyi.common.core.validate.EditGroup; import org.ruoyi.common.core.validate.EditGroup;
import org.ruoyi.common.log.enums.BusinessType; import org.ruoyi.common.log.enums.BusinessType;
import utils.excel.common.org.ruoyi.ExcelUtil; import org.ruoyi.common.excel.utils.ExcelUtil;
import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.service.I${ClassName}Service; import ${packageName}.service.${ClassName}Service;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
import org.ruoyi.core.page.TableDataInfo; import org.ruoyi.core.page.TableDataInfo;
#elseif($table.tree) #elseif($table.tree)
@@ -37,7 +37,7 @@ import org.ruoyi.core.page.TableDataInfo;
@RequestMapping("/${moduleName}/${businessName}") @RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController { public class ${ClassName}Controller extends BaseController {
private final I${ClassName}Service ${className}Service; private final ${ClassName}Service ${className}Service;
/** /**
* 查询${functionName}列表 * 查询${functionName}列表

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
import ${import}; import ${import};
#end #end
import java.io.Serial; import org.ruoyi.core.domain.BaseEntity;
/** /**
* ${functionName}对象 ${tableName} * ${functionName}对象 ${tableName}
@@ -34,8 +34,6 @@ import java.io.Serial;
@TableName("${tableName}") @TableName("${tableName}")
public class ${ClassName} extends ${Entity} { public class ${ClassName} extends ${Entity} {
@Serial
private static final long serialVersionUID=1L;
#foreach ($column in $columns) #foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField)) #if(!$table.isSuperColumn($column.javaField))

2
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
View File

@@ -3,6 +3,7 @@ package ${packageName}.mapper;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.vo.${ClassName}Vo;
import org.ruoyi.core.mapper.BaseMapperPlus; import org.ruoyi.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/** /**
* ${functionName}Mapper接口 * ${functionName}Mapper接口
@@ -10,6 +11,7 @@ import org.ruoyi.core.mapper.BaseMapperPlus;
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
@Mapper
public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> { public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> {
} }

3
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm
View File

@@ -1,6 +1,5 @@
package ${packageName}.service; package ${packageName}.service;
import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.bo.${ClassName}Bo;
#if($table.crud || $table.sub) #if($table.crud || $table.sub)
@@ -17,7 +16,7 @@ import java.util.List;
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
public interface I${ClassName}Service { public interface ${ClassName}Service {
/** /**
* 查询${functionName} * 查询${functionName}

6
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
View File

@@ -14,7 +14,8 @@ import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.service.I${ClassName}Service; import ${packageName}.service.${ClassName}Service;
import org.ruoyi.common.core.utils.StringUtils;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -28,7 +29,7 @@ import java.util.Collection;
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class ${ClassName}ServiceImpl implements I${ClassName}Service { public class ${ClassName}ServiceImpl implements ${ClassName}Service {
private final ${ClassName}Mapper baseMapper; private final ${ClassName}Mapper baseMapper;
@@ -62,7 +63,6 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
} }
private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) { private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query) #if($column.query)

7
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
View File

@@ -6,13 +6,9 @@ package ${packageName}.domain.vo;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import annotation.excel.common.org.ruoyi.ExcelDictFormat;
import convert.excel.common.org.ruoyi.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -27,9 +23,6 @@ import java.util.Date;
@AutoMapper(target = ${ClassName}.class) @AutoMapper(target = ${ClassName}.class)
public class ${ClassName}Vo implements Serializable { public class ${ClassName}Vo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.list) #if($column.list)
/** /**