From e61f7f1ecbd6ad3eae3c5f616742670ff4a479b6 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 10 Dec 2020 16:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=BB=E5=AD=90=E8=A1=A8=E6=9C=8D=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=9B=E5=8E=BB=E6=8E=89=E5=A4=8D?= =?UTF-8?q?=E9=80=89=E6=A1=86=E5=BF=85=E9=A1=BB=E9=80=89=E6=8B=A9=E4=B8=80?= =?UTF-8?q?=E9=A1=B9=E7=9A=84=E9=AA=8C=E8=AF=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/modules/gen/crud/controller.xml | 24 +++++++++++++++---- .../templates/modules/gen/crud/service.xml | 18 ++++++++++++++ .../modules/gen/crud_cloud/service.xml | 18 ++++++++++++++ .../modules/gen/query/controller.xml | 20 ++++++++++++++-- .../templates/modules/gen/query/service.xml | 18 ++++++++++++++ 5 files changed, 92 insertions(+), 6 deletions(-) diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml index ee15edae..9f00f08f 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml @@ -9,12 +9,11 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. */ package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''}; -<% if(table.isTreeEntity){ %> +<% if (table.isTreeEntity){ %> import java.util.List; import java.util.Map; <% }else{ %> - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; <% } %> @@ -45,6 +44,9 @@ import com.jeesite.common.codec.EncodeUtils; <% } %> import com.jeesite.common.web.BaseController; import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}; +<% for (child in table.childList){ %> +import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}; +<% } %> import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service; /** @@ -120,6 +122,20 @@ public class ${ClassName}Controller extends BaseController { return page; } <% } %> + <% for (child in table.childList){ %> + + /** + * 查询子表数据 + */ + @RequiresPermissions("${permissionPrefix}:view") + @RequestMapping(value = "${@StringUtils.uncap(child.className)}ListData") + @ResponseBody + public Page<${@StringUtils.cap(child.className)}> subListData(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}, HttpServletRequest request, HttpServletResponse response) { + ${@StringUtils.uncap(child.className)}.setPage(new Page<>(request, response)); + Page<${@StringUtils.cap(child.className)}> page = ${className}Service.findSubPage(${@StringUtils.uncap(child.className)}); + return page; + } + <% } %> /** * 查看编辑表单 @@ -287,12 +303,12 @@ public class ${ClassName}Controller extends BaseController { */ @RequiresPermissions("${permissionPrefix}:view") @RequestMapping(value = "${className}Select") - public String empUserSelect(${ClassName} ${className}, String selectData, Model model) { + public String ${className}Select(${ClassName} ${className}, String selectData, Model model) { String selectDataJson = EncodeUtils.decodeUrl(selectData); if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){ model.addAttribute("selectData", selectDataJson); } - model.addAttribute("${ClassName}", ${className}); + model.addAttribute("${className}", ${className}); return "${lastPackageName}/${viewPrefix}Select"; } <% } %> diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml index e3f8c715..34d6ae7d 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml @@ -10,7 +10,9 @@ */ package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}; +<% if (table.isTreeEntity){ %> import java.util.List; +<% } %> <% if (table.childList.~size > 0){ %> import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +<% if (!table.isTreeEntity){ %> import com.jeesite.common.entity.Page; +<% } %> import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service; import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}; import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao; @@ -96,6 +100,20 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv return super.findList(${className}); } <% } %> + <% for (child in table.childList){ %> + + /** + * 查询子表分页数据 + * @param ${@StringUtils.uncap(child.className)} + * @param ${@StringUtils.uncap(child.className)}.page 分页对象 + * @return + */ + public Page<${@StringUtils.cap(child.className)}> findSubPage(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}) { + Page<${@StringUtils.cap(child.className)}> page = ${@StringUtils.uncap(child.className)}.getPage(); + page.setList(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)})); + return page; + } + <% } %> /** * 保存数据（插入或更新） diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml index 49950181..6f410d06 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml @@ -10,7 +10,9 @@ */ package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}; +<% if (table.isTreeEntity){ %> import java.util.List; +<% } %> <% if (table.childList.~size > 0){ %> import org.springframework.beans.factory.annotation.Autowired; @@ -19,7 +21,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RestController; +<% if (!table.isTreeEntity){ %> import com.jeesite.common.entity.Page; +<% } %> import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Crud'}Service; import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}; import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao; @@ -100,6 +104,20 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Crud'}Serv return super.findList(${className}); } <% } %> + <% for (child in table.childList){ %> + + /** + * 查询子表分页数据 + * @param ${@StringUtils.uncap(child.className)} + * @param ${@StringUtils.uncap(child.className)}.page 分页对象 + * @return + */ + public Page<${@StringUtils.cap(child.className)}> findSubPage(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}) { + Page<${@StringUtils.cap(child.className)}> page = ${@StringUtils.uncap(child.className)}.getPage(); + page.setList(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)})); + return page; + } + <% } %> /** * 保存数据（插入或更新） diff --git a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml index 1a6b95f1..5478718e 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/controller.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/controller.xml @@ -9,12 +9,11 @@ * Copyright (c) 2013-Now http://jeesite.com All rights reserved. */ package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModuleName:''}; -<% if(table.isTreeEntity){ %> +<% if (table.isTreeEntity){ %> import java.util.List; import java.util.Map; <% }else{ %> - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; <% } %> @@ -39,6 +38,9 @@ import com.jeesite.common.entity.Page; <% } %> import com.jeesite.common.web.BaseController; import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}; +<% for (child in table.childList){ %> +import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${@StringUtils.cap(child.className)}; +<% } %> import ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Service; /** @@ -114,6 +116,20 @@ public class ${ClassName}Controller extends BaseController { return page; } <% } %> + <% for (child in table.childList){ %> + + /** + * 查询子表数据 + */ + @RequiresPermissions("${permissionPrefix}:view") + @RequestMapping(value = "${@StringUtils.uncap(child.className)}ListData") + @ResponseBody + public Page<${@StringUtils.cap(child.className)}> subListData(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}, HttpServletRequest request, HttpServletResponse response) { + ${@StringUtils.uncap(child.className)}.setPage(new Page<>(request, response)); + Page<${@StringUtils.cap(child.className)}> page = ${className}Service.findSubPage(${@StringUtils.uncap(child.className)}); + return page; + } + <% } %> /** * 查看编辑表单 diff --git a/modules/core/src/main/resources/templates/modules/gen/query/service.xml b/modules/core/src/main/resources/templates/modules/gen/query/service.xml index 91f1eb50..5d8b6aee 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/service.xml @@ -10,14 +10,18 @@ */ package ${packageName}.${moduleName}.service${isNotEmpty(subModuleName)?'.'+subModuleName:''}; +<% if (table.isTreeEntity){ %> import java.util.List; +<% } %> <% if (table.childList.~size > 0){ %> import org.springframework.beans.factory.annotation.Autowired; <% } %> import org.springframework.stereotype.Service; +<% if (!table.isTreeEntity){ %> import com.jeesite.common.entity.Page; +<% } %> import com.jeesite.common.service.${table.isTreeEntity?'Tree':'Query'}Service; import ${packageName}.${moduleName}.entity${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}; import ${packageName}.${moduleName}.dao${isNotEmpty(subModuleName)?'.'+subModuleName:''}.${ClassName}Dao; @@ -84,6 +88,20 @@ public class ${ClassName}Service extends ${table.isTreeEntity?'Tree':'Query'}Ser return super.findList(${className}); } <% } %> + <% for (child in table.childList){ %> + + /** + * 查询子表分页数据 + * @param ${@StringUtils.uncap(child.className)} + * @param ${@StringUtils.uncap(child.className)}.page 分页对象 + * @return + */ + public Page<${@StringUtils.cap(child.className)}> findSubPage(${@StringUtils.cap(child.className)} ${@StringUtils.uncap(child.className)}) { + Page<${@StringUtils.cap(child.className)}> page = ${@StringUtils.uncap(child.className)}.getPage(); + page.setList(${@StringUtils.uncap(child.className)}Dao.findList(${@StringUtils.uncap(child.className)})); + return page; + } + <% } %> }]]>