update mapper.java.vm

Author: devcxl

src/main/java/cn/devcxl/generator/CodeGenerator.java

@@ -52,7 +52,7 @@ public static void main(String[] args) {
         VelocityContext context = VelocityUtils.prepareContext(configuration, entityInfo);
 
 
-        String template = "templates/java/query.java.vm" ;
+        String template = "templates/java/mapper.java.vm" ;
         StringWriter sw = new StringWriter();
         Template tpl = Velocity.getTemplate(template, Velocity.ENCODING_DEFAULT);
         tpl.merge(context, sw);

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

@@ -5,27 +5,62 @@ import java.util.List;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.param.Query${ClassName};
 import cn.devcxl.common.base.PageRequest;
+import ${primaryKeyField.fieldType.javaType};
 
 /**
- * ${functionName}Mapper接口
+ * ${entity.name}Mapper接口
  *
  * @author ${author}
  * @date ${datetime}
  */
 public interface ${ClassName}Mapper {
+
     /**
      * 查询${ClassName}列表
      *
-     * @param ${className} ${functionName}
+     * @param query${ClassName}  ${entity.name}列表查询条件
+     * @param pageRequest 分页查询参数
      * @return ${ClassName}集合
      */
     List<${ClassName}> page(Query${ClassName} query${ClassName}, PageRequest pageRequest);
 
 
+    /**
+     * 插入${ClassName}全部数据
+     * @return
+     */
+    int insert(${ClassName} ${className});
+
+
+    /**
+     * 插入${ClassName}必需数据
+     * @return
+     */
+    int insertRequired(${ClassName} ${className});
+
+
+    /**
+     * 根据${ClassName}的ID删除数据
+     * @return
+     */
+    int delete(${primaryKeyField.fieldType.javaShortType} id);
+
+    /**
+     * 根据${ClassName}的ID修改数据
+     * @return
+     */
+    int update(${ClassName} ${className});
+
+    /**
+     * 根据${ClassName}的ID查询数据
+     * @return
+     */
+    ${ClassName} getById(${primaryKeyField.fieldType.javaShortType} id);
+
     /**
      * 查询${ClassName}列表的统计数量
-     * @param query
-     * @param pageRequest
+     * @param query${ClassName} ${entity.name}列表查询条件
+     * @param pageRequest 分页查询参数
      * @return 统计数量
      */
     Long count(Query${ClassName} query${ClassName}, PageRequest pageRequest);

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

@@ -8,7 +8,7 @@
     #end
     </resultMap>
 
-    <select id="page" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
+    <select id="page" resultMap="${ClassName}Result">
         select #foreach($field in $fields)`$field.name`#if($foreach.hasNext),#end#end from `${tableName}`
         <where>
 #foreach($field in $fields)
@@ -43,6 +43,38 @@
 #end
     </select>
 
+    <select id="count"  resultMap="${ClassName}Result">
+        select count(1) from `${tableName}`
+        <where>
+#foreach($field in $fields)
+#set($queryType=$field.queryType)
+#set($javaField=$field.javaField)
+#set($javaType=$field.fieldType.javaShortType)
+#set($columnName=$field.name)
+#set($AttrName=$javaField.substring(0,1).toUpperCase() + ${javaField.substring(1)})
+#if($field.query)
+#if($field.queryType == "EQ")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` = #{$javaField}</if>
+#elseif($queryType == "NE")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` != #{$javaField}</if>
+#elseif($queryType == "GT")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` &gt; #{$javaField}</if>
+#elseif($queryType == "GTE")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` &gt;= #{$javaField}</if>
+#elseif($queryType == "LT")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` &lt; #{$javaField}</if>
+#elseif($queryType == "LTE")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` &lt;= #{$javaField}</if>
+#elseif($queryType == "LIKE")
+             <if test="$javaField != null #if($javaType == 'String' ) and $javaField.trim() != ''#end"> and `$columnName` like concat('%', #{$javaField}, '%')</if>
+#elseif($queryType == "BETWEEN")
+             <if test="begin$AttrName != null and begin$AttrName != '' and end$AttrName != null and end$AttrName != ''"> and `$columnName` between #{begin$AttrName} and #{end$AttrName}</if>
+#end
+#end
+#end
+        </where>
+    </select>
+
     <!-- 增加 -->
     <insert id="insert" parameterType="${packageName}.domain.${ClassName}">
         INSERT INTO `${tableName}` (#foreach($field in $fields)`$field.name`#if($foreach.hasNext),#end#end)
@@ -79,15 +111,6 @@
         SELECT * FROM `${tableName}` WHERE id = #{id}
     </select>
 
-    <!-- 分页查询用户列表 -->
-    <select id="getUsersByPage" parameterType="map" resultType="${packageName}.domain.${ClassName}">
-        SELECT *
-        FROM `${tableName}`
-        WHERE is_deleted = 0
-        ORDER BY id
-            LIMIT #{start}, #{pageSize}
-    </select>
-
     <!-- 批量虚拟删除 -->
     <update id="batchDelete" parameterType="list">
         UPDATE `${tableName}`