diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm index dda8687..8f5cfa2 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/controller.java.vm @@ -71,8 +71,7 @@ public class ${ClassName}Controller extends HcyBaseController { } } #elseif($table.tree) - public AjaxResult list(${ClassName} ${className}) - { + public AjaxResult list(${ClassName} ${className}) { List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return AjaxResult.success(list); } diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm index 05cec53..3c2a5ec 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm @@ -12,8 +12,7 @@ import ${packageName}.entity.${subClassName}; * @author ${author} * @date ${datetime} */ -public interface ${ClassName}Dao -{ +public interface ${ClassName}Dao { /** * 查询${functionName} * @@ -60,7 +59,7 @@ public interface ${ClassName}Dao * @param ${pkColumn.javaField}s 需要删除的数据ID * @return 结果 */ - public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); + int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s); #if($table.sub) /** diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm index e517e43..ffa0347 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm @@ -71,26 +71,22 @@ public class ${ClassName} extends ${Entity} #else #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #end - public void set${AttrName}($column.javaType $column.javaField) - { + public void set${AttrName}($column.javaType $column.javaField){ this.$column.javaField = $column.javaField; } - public $column.javaType get${AttrName}() - { + public $column.javaType get${AttrName}(){ return $column.javaField; } #end #end #if($table.sub) - public List<${subClassName}> get${subClassName}List() - { + public List<${subClassName}> get${subClassName}List(){ return ${subclassName}List; } - public void set${subClassName}List(List<${subClassName}> ${subclassName}List) - { + public void set${subClassName}List(List<${subClassName}> ${subclassName}List){ this.${subclassName}List = ${subclassName}List; } diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm index 174d0da..71720a0 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -175,6 +175,9 @@ public class ${ClassName}ServiceImpl implements ${ClassName}Service { return new ServerResult(false,ReturnConstants.SYS_FAILL); } }catch (RuntimeException e){ +#if($table.sub) + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); +#end logger.error(e.getMessage()); return new ServerResult(false,ReturnConstants.DB_EX); } diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm index c99ea40..92b7908 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm @@ -14,8 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ${author} * @date ${datetime} */ -public class ${subClassName} extends BaseEntity -{ +public class ${subClassName} extends BaseEntity{ private static final long serialVersionUID = 1L; #foreach ($column in $subTable.columns) @@ -48,13 +47,11 @@ public class ${subClassName} extends BaseEntity #else #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #end - public void set${AttrName}($column.javaType $column.javaField) - { + public void set${AttrName}($column.javaType $column.javaField){ this.$column.javaField = $column.javaField; } - public $column.javaType get${AttrName}() - { + public $column.javaType get${AttrName}(){ return $column.javaField; } #end