add common & update template

Author: devcxl

pom.xml

@@ -31,6 +31,12 @@
             <version>${hutools.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.devcxl</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

src/main/java/cn/devcxl/generator/utils/VelocityUtils.java

@@ -56,7 +56,7 @@ public static List<String> getTemplateList() {
         // 实体类
         templates.add("templates/java/domain.java.vm");
         // 展示类
-//        templates.add("templates/java/projection.java.vm");
+        templates.add("templates/java/projection.java.vm");
         // 查询条件
         templates.add("templates/java/query.java.vm");
 //        templates.add("templates/java/service.java.vm");

src/main/resources/templates/java/mapper.java.vm

@@ -1,24 +1,31 @@
 package ${packageName}.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
+
 import ${packageName}.domain.${ClassName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * ${functionName}Mapper接口
  *
  * @author ${author}
  * @date ${datetime}
  */
-@Mapper
 public interface ${ClassName}Mapper {
     /**
      * 查询${ClassName}列表
      *
      * @param ${className} ${functionName}
      * @return ${ClassName}集合
      */
-    List<${ClassName}> list(Query${ClassName} query${ClassName});
+    List<${ClassName}> page(Query${ClassName} query${ClassName}, PageRequest pageRequest);
+
+
+    /**
+     * 查询${ClassName}列表的统计数量
+     * @param query
+     * @param pageRequest
+     * @return 统计数量
+     */
+    Long count(Query${ClassName} query${ClassName}, PageRequest pageRequest);
 
 }

src/main/resources/templates/java/service.java.vm

@@ -1,25 +1,24 @@
 package ${packageName}.service;
 
 import java.util.List;
-import com.github.pagehelper.PageInfo;
-import com.pearadmin.common.web.domain.request.PageDomain;
+import cn.devcxl.common.base.*;
 import ${packageName}.domain.${ClassName};
-import com.baomidou.mybatisplus.extension.service.IService;
+import ${packageName}.domain.param.Query${ClassName};
 
 /**
- * ${functionName}Service接口
+ * ${ClassName}Service接口
  *
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service extends IService<${ClassName}> {
+public interface I${ClassName}Service {
 
     /**
-     * 查询${functionName}
-     * @param ${className} ${functionName}
-     * @param pageDomain
-     * @return ${functionName} 分页集合
+     * 查询${ClassName}
+     * @param Query${ClassName}
+     * @param pageRequest
+     * @return ${ClassName} 分页集合
      * */
-    PageInfo<${ClassName}> select${ClassName}Page(${ClassName} ${className}, PageDomain pageDomain);
+    PageResponse<${ClassName}> select${ClassName}Page(${ClassName} ${className}, PageRequest pageRequest);
 
 }

src/main/resources/templates/java/serviceImpl.java.vm

@@ -2,39 +2,40 @@ 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;
+
+import cn.devcxl.common.base.*;
 import org.springframework.stereotype.Service;
 import ${packageName}.mapper.${ClassName}Mapper;
-import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.domain.param.Query${ClassName};
 
-import java.util.Arrays;
 /**
- * ${functionName}Service业务层处理
+ * ${ClassName}Service业务层处理
  *
  * @author ${author}
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper,${ClassName}> implements I${ClassName}Service {
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
 
+    private ${ClassName}Mapper ${className}Mapper;
+
+    public ServiceImpl(${ClassName}Mapper ${className}Mapper) {
+        this.${className}Mapper = ${className}Mapper;
+    }
 
     /**
-     * 查询${functionName}
+     * 查询${ClassName}
      * @param ${className} ${functionName}
-     * @param pageDomain
-     * @return ${functionName} 分页集合
+     * @param pageRequest
+     * @return ${ClassName} 分页集合
      * */
     @Override
-    public PageInfo<${ClassName}> select${ClassName}Page(${ClassName} ${className}, PageDomain pageDomain) {
-        PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit());
-        List<${ClassName}> data = baseMapper.select${ClassName}List(${className});
-        return new PageInfo<>(data);
+    public PageResponse<${ClassName}> ${className}Page(Query${ClassName} query${ClassName}, PageRequest pageRequest) {
+        List<${ClassName}> list = ${className}Mapper.page(query${ClassName}, pageRequest);
+        Long count = ${className}Mapper.count(query${ClassName}, pageRequest);
+        return new PageResponse<${ClassName}>(pageRequest,count,list);
     }
 
 }

src/main/resources/templates/xml/mapper.xml.vm

@@ -8,7 +8,7 @@
     #end
     </resultMap>
 
-    <select id="list" parameterType="${ClassName}" resultMap="${ClassName}Result">
+    <select id="page" parameterType="${ClassName}" resultMap="${ClassName}Result">
         select #foreach($field in $fields)`$field.name`#if($foreach.hasNext),#end#end from `${tableName}`
         <where>
 #foreach($field in $fields)