diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index f26375d..25daa1d 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -78,9 +78,8 @@ public class ${ClassName} extends ${Entity} { /** * 查询构造器 */ - public static ${ClassName} queryBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}QueryReq ${className}QueryReq){ + public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){ return ${ClassName}.builder() - .${pkColumn.javaField}(${pkColumn.javaField}) #foreach ($column in $columns) #if($column.isQuery == '1') #if(!$table.isSuperColumn($column.javaField)) @@ -119,21 +118,22 @@ public class ${ClassName} extends ${Entity} { /** * 修改构造器 */ - public static ${ClassName} editBuild(${ClassName}EditReq ${className}EditReq){ + public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){ return ${ClassName}.builder() + .${pkColumn.javaField}(${pkColumn.javaField}) #foreach ($column in $columns) - #if($column.isInsert == '1') + #if($column.isEdit == '1') #if(!$table.isSuperColumn($column.javaField)) #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) #set($AttrName=$column.javaField) #else #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #end - .${column.javaField}(${className}EditReq.get${AttrName}()) + .${column.javaField}(${className}EditReq.get${AttrName}()) #end #end #end - .build(); + .build(); } } diff --git a/ruoyi-generator/src/main/resources/vm/java/edit.java.vm b/ruoyi-generator/src/main/resources/vm/java/edit.java.vm index 3c34cf6..4714554 100644 --- a/ruoyi-generator/src/main/resources/vm/java/edit.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/edit.java.vm @@ -49,18 +49,10 @@ public class ${ClassName}EditReq extends ${Entity} { #else #set($comment=$column.columnComment) #end - #if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - #elseif($column.javaType == 'Date') + #if($column.javaType == 'Date') @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") - #else - @Excel(name = "${comment}") #end #end - #if($column.javaField == $pkColumn.javaField) - @TableId(value = "${pkColumn.javaField}",type = IdType.AUTO) - #end #set($isRequired='') #if($column.isRequired == '1') #set($isRequired=', required = true') diff --git a/ruoyi-generator/src/main/resources/vm/java/save.java.vm b/ruoyi-generator/src/main/resources/vm/java/save.java.vm index 11bcf47..c3674a2 100644 --- a/ruoyi-generator/src/main/resources/vm/java/save.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/save.java.vm @@ -49,18 +49,11 @@ public class ${ClassName}SaveReq extends ${Entity} { #else #set($comment=$column.columnComment) #end - #if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") - #elseif($column.javaType == 'Date') + #if($column.javaType == 'Date') @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") - #else - @Excel(name = "${comment}") #end #end - #if($column.javaField == $pkColumn.javaField) - @TableId(value = "${pkColumn.javaField}",type = IdType.AUTO) - #end + #set($isRequired='') #if($column.isRequired == '1') #set($isRequired=', required = true') diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm index 0575583..787f1db 100644 --- a/ruoyi-generator/src/main/resources/vm/sql/sql.vm +++ b/ruoyi-generator/src/main/resources/vm/sql/sql.vm @@ -1,22 +1,22 @@ -- 菜单 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 1, sysdate(), null, null, '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 1, sysdate(), null, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 1, sysdate(), null, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 1, sysdate(), null, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 1, sysdate(), null, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 1, sysdate(), null, null, ''); \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml deleted file mode 100644 index 83103aa..0000000 --- a/ruoyi-system/src/main/resources/mapper/book/BookInfoMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - select id, name, price, create_by, create_time from book_info - - -