自动生成工具修改 gengdidi

gassafety-generator/src/main/resources/vm/java/controller.java.vm

@@ -18,6 +18,7 @@ import com.zehong.common.enums.BusinessType;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
 import com.zehong.common.utils.poi.ExcelUtil;
+import com.github.pagehelper.PageInfo;
 #if($table.crud || $table.sub)
 import com.zehong.common.core.page.TableDataInfo;
 #elseif($table.tree)
@@ -37,17 +38,6 @@ public class ${ClassName}Controller extends BaseController
     private I${ClassName}Service ${className}Service;
 
      /**
-    * ${functionName}分页查询
-    */
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:pageList')")
-    @GetMapping("/pageList")
-    public TableDataInfo pageList(${ClassName} ${className}){
-        startPage();
-        PageInfo<${ClassName}> page = ${className}Service.select${ClassName}Page(${className});
-        return getDataTable(page);
-    }
-
-/**
      * 查询${functionName}列表
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
@@ -56,7 +46,7 @@ public class ${ClassName}Controller extends BaseController
     public TableDataInfo list(${ClassName} ${className})
     {
         startPage();
-        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        PageInfo<${ClassName}> list = ${className}Service.select${ClassName}Page(${className});
         return getDataTable(list);
     }
 #elseif($table.tree)

gassafety-generator/src/main/resources/vm/java/service.java.vm

@@ -2,6 +2,7 @@ package ${packageName}.service;
 
 import java.util.List;
 import ${packageName}.domain.${ClassName};
+import com.github.pagehelper.PageInfo;
 
 /**
  * ${functionName}Service接口
@@ -33,7 +34,7 @@ public interface I${ClassName}Service
      * @param ${className} ${functionName}
      * @return ${functionName}分页集合
      */
-    public List<${ClassName}> select${ClassName}Page(${ClassName} ${className});
+    public PageInfo<${ClassName}> select${ClassName}Page(${ClassName} ${className});
 
     /**
      * 新增${functionName}

gassafety-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -19,6 +19,7 @@ import ${packageName}.domain.${subClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
+import com.github.pagehelper.PageInfo;
 
 /**
  * ${functionName}Service业务层处理
@@ -63,9 +64,9 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public PageInfo<${ClassName}> select${ClassName}List(${ClassName} ${className})
+    public PageInfo<${ClassName}> select${ClassName}Page(${ClassName} ${className})
     {
-        return new PageInfo<>(${className}Mapper.select${ClassName}List(${className}));
+        return new PageInfo(${className}Mapper.select${ClassName}List(${className}));
     }
 
     /**

gassafety-generator/src/main/resources/vm/js/api.js.vm

 import request from '@/utils/request'
 
-// 查询${functionName}列表
-export function page${BusinessName}(query) {
-    return request({
-        url: '/${moduleName}/${businessName}/pageList',
-        method: 'get',
-        params: query
-    })
-}
-
 // 查询${functionName}列表
 export function list${BusinessName}(query) {
   return request({

gassafety-generator/src/main/resources/vm/vue/index.vue.vm

@@ -458,7 +458,7 @@ export default {
       }
 #end
 #end
-      page${BusinessName}(this.queryParams).then(response => {
+      list${BusinessName}(this.queryParams).then(response => {
         this.${businessName}List = response.rows;
         this.total = response.total;
         this.loading = false;