diff --git a/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm b/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm index b9d8b9d49cfda0bb7659b83eec410bc948fa547b..d611448ff31214876e9d2b9d4373a93d2f547b0f 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/html/add.html.vm @@ -96,7 +96,7 @@ let $ = layui.jquery; let laydate = layui.laydate; - let prefix = "/${moduleName}/${businessName}" + let prefix = "/${moduleName}/${businessName}/" #foreach($column in $columns) #set($field=$column.javaField) diff --git a/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm b/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm index 59692b164a0badbccaa1e6909101495c53729806..41f60f1ad55748c94931e0b0235c1e17d6e1a81b 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/html/edit.html.vm @@ -96,7 +96,7 @@ let $ = layui.jquery; let laydate = layui.laydate; - let prefix = "/${moduleName}/${businessName}"; + let prefix = "/${moduleName}/${businessName}/"; #foreach($column in $columns) #if($column.edit && !$column.pk) diff --git a/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm b/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm index 24b315e2c49a93fb366b539e609475eccde90f03..5c710681622118dde8cf204b8887734912aaeeca 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/html/list.html.vm @@ -7,7 +7,7 @@
-
+ #foreach($column in $columns) #if($column.query) #set($javaField=$column.javaField) @@ -73,7 +73,7 @@ let form = layui.form; let $ = layui.jquery; - let prefix = "/${moduleName}/${businessName}"; + let prefix = "/${moduleName}/${businessName}/"; let cols = [ [ @@ -129,7 +129,7 @@ }); form.on('submit(${businessName}-query)', function (data) { - window.refresh(data.field); + table.reload('${businessName}-table', {where: data.field}) return false; }); diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm index 888a18fc499a5bd3fae068b6a42dba0f82f68a3a..45b2737238ac35b637818982904518264c600ef6 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/java/controller.java.vm @@ -3,12 +3,14 @@ package ${packageName}.controller; import java.util.List; import com.github.pagehelper.PageInfo; +import ${packageName}.domain.${ClassName}; import com.pearadmin.common.tools.text.Convert; import com.pearadmin.common.web.base.BaseController; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.common.web.domain.response.Result; import com.pearadmin.common.web.domain.response.ResultTable; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -42,9 +44,9 @@ public class ${ClassName}Controller extends BaseController @ResponseBody @GetMapping("/data") @PreAuthorize("hasPermission('/${moduleName}/${businessName}/data','${permissionPrefix}:data')") - public ResultTable list(${ClassName} ${className}, PageDomain pageDomain) + public ResultTable list(@ModelAttribute ${ClassName} ${className}, PageDomain pageDomain) { - PageInfo<${ClassName}> pageInfo = ${className}Service.select${ClassName}List(${className}); + PageInfo<${ClassName}> pageInfo = ${className}Service.select${ClassName}Page(${className},pageDomain); return pageTable(pageInfo.getList(),pageInfo.getTotal()); } diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm index 7447549b8a4b3e915b9d3faecc9d5ee0365ae7fa..ec1e8757953f7e805a6516c0bcfc063763f51de6 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/java/domain.java.vm @@ -7,9 +7,9 @@ import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; #if($table.crud || $table.sub) -com.pearadmin.common.web.base.BaseDomain; +import com.pearadmin.common.web.base.BaseDomain; #elseif($table.tree) -com.pearadmin.common.web.base.TreeDomain; +import com.pearadmin.common.web.base.TreeDomain; #end /** diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm index 8c6ba3ee31f2e97931dab58d47e9646bf9ea64b2..0ae8f46708ba2582383f289e48643e84b487d067 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/java/service.java.vm @@ -1,9 +1,9 @@ package ${packageName}.service; import java.util.List; -import import com.github.pagehelper.PageInfo; -import com.pearadmin.common.web.domain.request.PageDomain; ${packageName}.domain.${ClassName}; +import com.pearadmin.common.web.domain.request.PageDomain; +import ${packageName}.domain.${ClassName}; /** * ${functionName}Service接口 diff --git a/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm b/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm index 3e51ad3f4dea405ac4b8a904d39faf2d278248d1..0c4ca4f9b42424048e800d14feac2f58e301d32f 100644 --- a/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/pear-modules/pear-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,6 +3,7 @@ package ${packageName}.service.impl; import java.util.List; import java.util.ArrayList; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import org.springframework.beans.factory.annotation.Autowired; @@ -49,7 +50,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service /** * 查询${functionName} - * @param ${classsName} ${functionName} + * @param ${className} ${functionName} * @param pageDomain * @return ${functionName} 分页集合 * */