From 7b26bde27a731aea6b8a6eabe1f92e287ad94557 Mon Sep 17 00:00:00 2001
From: wind <he745764370@gmail.com>
Date: Mon, 5 Apr 2021 18:52:16 +0800
Subject: [PATCH] add mapper

---
 build.gradle                                  | 10 ++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 src/main/resources/META-INF/plugin.xml        | 16 +++---
 .../resources/globalConfig/Default/init.vm    |  2 +-
 .../resources/template/Default/dao.java.vm    | 26 +++++++++-
 .../resources/template/Default/mapper.xml.vm  | 49 +++++++++++++++++++
 6 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index e7fc509..e84af83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.3.5'
+    id 'org.jetbrains.intellij' version '0.7.2'
 }
 
 //2.1 插件配置
@@ -17,7 +17,7 @@ apply plugin: 'idea'
 apply plugin: 'org.jetbrains.intellij'
 
 group 'com.bruce'
-version '1.2.3-RELEASE'
+version '1.2.4-RELEASE'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -42,12 +42,12 @@ intellij {
     sandboxDirectory = "${rootProject.rootDir}/idea-sandbox"
     // 开发环境运行时使用的版本 2018.1.6 LATEST-EAP-SNAPSHOT
     //测试最新版本
-//    version '2018.1.6'
+    version '2018.1.6'
     type 'IU'
 
-    localPath 'G:\\Program Files\\JetBrains\\IntelliJ IDEA 201.5616.10'
+//    localPath '/Users/wind/.gradle/caches/modules-2/files-2.1/com.jetbrains.intellij.idea/ideaIC/LATEST-EAP-SNAPSHOT/754a628dd74aa813e7ecac0f4179612ecee07de6/ideaIC-LATEST-EAP-SNAPSHOT'
     // 依赖的插件
-    plugins = ['DatabaseTools', 'Velocity','Kotlin','Java']
+    plugins = ['DatabaseTools', 'Velocity','Kotlin','JavaEE']
     //Disables updating since-build attribute in plugin.xml
     updateSinceUntilBuild false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9ebca1..86bf9f4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index bc763a6..83a77d1 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -22,12 +22,16 @@
 
 
     <change-notes><![CDATA[
-        <p>1.2.3-RELEASE</p>
-        <ul>
-            <li>1.EasyCode插件支持MybatisCodeHelper插件 在resultMap中添加Table注释</li>
-            <li>2.支持Kotlin代码生成</li>
-            <li>3.兼容2020版本</li>
-        </ul>
+      <p>1.2.4-RELEASE</p>
+      <ul>
+          <li>1.新增mapper sql</li>
+      </ul>
+      <p>1.2.3-RELEASE</p>
+      <ul>
+          <li>1.EasyCode插件支持MybatisCodeHelper插件 在resultMap中添加Table注释</li>
+          <li>2.支持Kotlin代码生成</li>
+          <li>3.兼容2020版本</li>
+      </ul>
       <p>1.2.2-RELEASE</p>
       <ul>
         <li>1.Fix unavailability of online import function.</li>
diff --git a/src/main/resources/globalConfig/Default/init.vm b/src/main/resources/globalConfig/Default/init.vm
index 628a583..692f9e1 100644
--- a/src/main/resources/globalConfig/Default/init.vm
+++ b/src/main/resources/globalConfig/Default/init.vm
@@ -1,7 +1,7 @@
 ##初始化区域
 
 ##去掉表的t_前缀
-$!tableInfo.setName($tool.getClassName($tableInfo.obj.name.replaceFirst("book_","")))
+$!tableInfo.setName($tool.getClassName($tableInfo.obj.name.replaceFirst("t_","")))
 
 ##参考阿里巴巴开发手册，POJO 类中布尔类型的变量，都不要加 is 前缀，否则部分框架解析会引起序列化错误
 #foreach($column in $tableInfo.fullColumn)
diff --git a/src/main/resources/template/Default/dao.java.vm b/src/main/resources/template/Default/dao.java.vm
index c7ccadb..d679196 100644
--- a/src/main/resources/template/Default/dao.java.vm
+++ b/src/main/resources/template/Default/dao.java.vm
@@ -31,6 +31,14 @@ public interface $!{tableName} {
      */
     $!{tableInfo.name} queryById($!pk.shortType $!pk.name);
 
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象
+     * @return 实例对象
+     */
+    $!{tableInfo.name} queryOne($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));
+
     /**
      * 查询指定行数据
      *
@@ -40,7 +48,6 @@ public interface $!{tableName} {
      */
     List<$!{tableInfo.name}> queryAllByLimit(@Param("offset") int offset, @Param("limit") int limit);
 
-
     /**
      * 通过实体作为筛选条件查询
      *
@@ -49,6 +56,23 @@ public interface $!{tableName} {
      */
     List<$!{tableInfo.name}> queryAll($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));
 
+    /**
+     * 查询指定行数据
+     *
+     * @param offset 查询起始位置
+     * @param limit 查询条数
+     * @return 对象列表
+     */
+    List<$!{tableInfo.name}> queryByLimit(@Param("$!tool.firstLowerCase($!{tableInfo.name})") $!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}), @Param("offset") int offset, @Param("limit") int limit);
+
+    /**
+     * 通过实体作为筛选条件查询
+     *
+     * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象
+     * @return 行数
+     */
+    int count($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));
+
     /**
      * 新增数据
      *
diff --git a/src/main/resources/template/Default/mapper.xml.vm b/src/main/resources/template/Default/mapper.xml.vm
index 343c936..0c5377e 100644
--- a/src/main/resources/template/Default/mapper.xml.vm
+++ b/src/main/resources/template/Default/mapper.xml.vm
@@ -30,12 +30,29 @@ $!callback.setSavePath($tool.append($modulePath, "/src/main/resources/mapper"))
         where $!pk.obj.name = #{$!pk.name}
     </select>
 
+    <!--查询单个-->
+    <select id="queryOne" resultMap="BaseResultMap">
+        select
+          #allSqlColumn()
+
+        from $!{tableInfo.obj.parent.name}.$!tableInfo.obj.name
+        <where>
+#foreach($column in $tableInfo.fullColumn)
+            <if test="$!column.name != null#if($column.type.equals("java.lang.String")) and $!column.name != ''#end">
+                and $!column.obj.name = #{$!column.name}
+            </if>
+#end
+        </where>
+        limit 0, 1
+    </select>
+
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="BaseResultMap">
         select
           #allSqlColumn()
 
         from $!{tableInfo.obj.parent.name}.$!tableInfo.obj.name
+        order by id desc
         limit #{offset}, #{limit}
     </select>
 
@@ -52,6 +69,38 @@ $!callback.setSavePath($tool.append($modulePath, "/src/main/resources/mapper"))
             </if>
 #end
         </where>
+        order by id desc
+    </select>
+
+    <!--通过实体作为筛选条件查询-->
+    <select id="queryByLimit" resultMap="BaseResultMap">
+        select
+        #allSqlColumn()
+
+        from $!{tableInfo.obj.parent.name}.$!tableInfo.obj.name
+        <where>
+#foreach($column in $tableInfo.fullColumn)
+            <if test="$!tool.firstLowerCase($!{tableInfo.name}).$!column.name != null#if($column.type.equals("java.lang.String")) and $!tool.firstLowerCase($!{tableInfo.name}).$!column.name != ''#end">
+                and $!column.obj.name = #{$!tool.firstLowerCase($!{tableInfo.name}).$!column.name}
+            </if>
+#end
+        </where>
+        order by id desc
+        limit #{offset}, #{limit}
+    </select>
+
+    <!--聚合查询-->
+    <select id="count" resultType="java.lang.Integer">
+        select
+        count(1)
+        from $!{tableInfo.obj.parent.name}.$!tableInfo.obj.name
+        <where>
+#foreach($column in $tableInfo.fullColumn)
+            <if test="$!column.name != null#if($column.type.equals("java.lang.String")) and $!column.name != ''#end">
+                and $!column.obj.name = #{$!column.name}
+            </if>
+#end
+        </where>
     </select>
 
     <!--新增所有列-->