@@ -38,7 +37,8 @@
- + +
diff --git a/src/main/resources/templates/vm/java/Controller.java.vm b/src/main/resources/templates/vm/java/Controller.java.vm index 88dfbade2..362287636 100644 --- a/src/main/resources/templates/vm/java/Controller.java.vm +++ b/src/main/resources/templates/vm/java/Controller.java.vm @@ -18,7 +18,7 @@ import com.ruoyi.framework.web.page.TableDataInfo; import com.ruoyi.framework.web.domain.Message; /** - * ${tableComment} 控制层处理 + * ${tableComment} 信息操作处理 * * @author ${author} * @date ${datetime} @@ -47,7 +47,7 @@ public class ${className}Controller extends BaseController @ResponseBody public TableDataInfo list(${className} ${classname}) { - setPageInfo(${classname}); + startPage(); List<${className}> list = ${classname}Service.select${className}List(${classname}); return getDataTable(list); } @@ -84,7 +84,7 @@ public class ${className}Controller extends BaseController { if (${classname}Service.save${className}(${classname}) > 0) { - return Message.ok(); + return Message.success(); } return Message.error(); } @@ -99,7 +99,7 @@ public class ${className}Controller extends BaseController { if (${classname}Service.delete${className}ById(${primaryKey.attrname}) > 0) { - return Message.ok(); + return Message.success(); } return Message.error(); } @@ -115,7 +115,7 @@ public class ${className}Controller extends BaseController int rows = ${classname}Service.batchDelete${className}(${primaryKey.attrname}s); if (rows > 0) { - return Message.ok(); + return Message.success(); } return Message.error(); } diff --git a/src/main/resources/templates/vm/java/Dao.java.vm b/src/main/resources/templates/vm/java/Mapper.java.vm similarity index 95% rename from src/main/resources/templates/vm/java/Dao.java.vm rename to src/main/resources/templates/vm/java/Mapper.java.vm index cd30d1972..4634a638a 100644 --- a/src/main/resources/templates/vm/java/Dao.java.vm +++ b/src/main/resources/templates/vm/java/Mapper.java.vm @@ -1,4 +1,4 @@ -package ${package}.dao; +package ${package}.mapper; import ${package}.domain.${className}; import java.util.List; @@ -9,7 +9,7 @@ import java.util.List; * @author ${author} * @date ${datetime} */ -public interface I${className}Dao +public interface I${className}Mapper { /** diff --git a/src/main/resources/templates/vm/java/ServiceImpl.java.vm b/src/main/resources/templates/vm/java/ServiceImpl.java.vm index 19792a2e6..a45815c36 100644 --- a/src/main/resources/templates/vm/java/ServiceImpl.java.vm +++ b/src/main/resources/templates/vm/java/ServiceImpl.java.vm @@ -4,7 +4,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.utils.StringUtils; -import ${package}.dao.I${className}Dao; +import ${package}.mapper.I${className}Mapper; import ${package}.domain.${className}; import ${package}.service.I${className}Service; @@ -18,7 +18,7 @@ import ${package}.service.I${className}Service; public class ${className}ServiceImpl implements I${className}Service { @Autowired - private I${className}Dao ${classname}Dao; + private I${className}Mapper ${classname}Mapper; /** * 查询${tableComment}信息 @@ -29,7 +29,7 @@ public class ${className}ServiceImpl implements I${className}Service @Override public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname}) { - return ${classname}Dao.select${className}ById(${primaryKey.attrname}); + return ${classname}Mapper.select${className}ById(${primaryKey.attrname}); } /** @@ -41,7 +41,7 @@ public class ${className}ServiceImpl implements I${className}Service @Override public List<${className}> select${className}List(${className} ${classname}) { - return ${classname}Dao.select${className}List(${classname}); + return ${classname}Mapper.select${className}List(${classname}); } /** @@ -53,7 +53,7 @@ public class ${className}ServiceImpl implements I${className}Service @Override public int insert${className}(${className} ${classname}) { - return ${classname}Dao.insert${className}(${classname}); + return ${classname}Mapper.insert${className}(${classname}); } /** @@ -65,7 +65,7 @@ public class ${className}ServiceImpl implements I${className}Service @Override public int update${className}(${className} ${classname}) { - return ${classname}Dao.update${className}(${classname}); + return ${classname}Mapper.update${className}(${classname}); } /** @@ -81,11 +81,11 @@ public class ${className}ServiceImpl implements I${className}Service int rows = 0; if (StringUtils.isNotNull(${primaryKey.attrname})) { - rows = ${classname}Dao.update${className}(${classname}); + rows = ${classname}Mapper.update${className}(${classname}); } else { - rows = ${classname}Dao.insert${className}(${classname}); + rows = ${classname}Mapper.insert${className}(${classname}); } return rows; } @@ -99,7 +99,7 @@ public class ${className}ServiceImpl implements I${className}Service @Override public int delete${className}ById(${primaryKey.attrType} ${primaryKey.attrname}) { - return ${classname}Dao.delete${className}ById(${primaryKey.attrname}); + return ${classname}Mapper.delete${className}ById(${primaryKey.attrname}); } /** @@ -111,7 +111,7 @@ public class ${className}ServiceImpl implements I${className}Service @Override public int batchDelete${className}(${primaryKey.attrType}[] ${primaryKey.attrname}s) { - return ${classname}Dao.batchDelete${className}(${primaryKey.attrname}s); + return ${classname}Mapper.batchDelete${className}(${primaryKey.attrname}s); } } diff --git a/src/main/resources/templates/vm/java/domain.java.vm b/src/main/resources/templates/vm/java/domain.java.vm index b1732a14f..d6e3c87cc 100644 --- a/src/main/resources/templates/vm/java/domain.java.vm +++ b/src/main/resources/templates/vm/java/domain.java.vm @@ -1,7 +1,6 @@ package ${package}.domain; -import java.io.Serializable; -import com.ruoyi.framework.web.page.PageDomain; +import com.ruoyi.framework.web.domain.BaseEntity; #if(${hasBigDecimal}) import java.math.BigDecimal; #end @@ -12,7 +11,7 @@ import java.math.BigDecimal; * @author ${author} * @date ${datetime} */ -public class ${className} extends PageDomain implements Serializable +public class ${className} extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/src/main/resources/templates/vm/xml/Mapper.xml.vm b/src/main/resources/templates/vm/xml/Mapper.xml.vm index d4d0583dc..fd1b71813 100644 --- a/src/main/resources/templates/vm/xml/Mapper.xml.vm +++ b/src/main/resources/templates/vm/xml/Mapper.xml.vm @@ -2,7 +2,7 @@ - + #foreach ($column in $columns) @@ -25,32 +25,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into ${tableName} - ( - #foreach($column in $columns) - #if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment') - $column.columnName#if($velocityCount != $columns.size()), #end - #end - #end - ) - values - ( - #foreach($column in $columns) - #if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment') - #{$column.attrname}#if($velocityCount != $columns.size()), #end - #end - #end - ) + insert into ${tableName} ( + #foreach($column in $columns) +#if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment') +$column.columnName#if($velocityCount != $columns.size()), #end +#end +#end +) + values ( + #foreach($column in $columns) +#if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment') +#{$column.attrname}#if($velocityCount != $columns.size()), #end +#end +#end +) update ${tableName} - #foreach($column in $columns) - #if($column.columnName != $primaryKey.columnName) - `$column.columnName` = #{$column.attrname}#if($velocityCount != $columns.size()), #end - #end - #end +#foreach($column in $columns) +#if($column.columnName != $primaryKey.columnName) + $column.columnName = #{$column.attrname}#if($velocityCount != $columns.size()), #end +#end +#end where ${primaryKey.columnName} = #{${primaryKey.attrname}}