Merge pull request #2 from suyin58/branch

Branch
suyin58 · Oct 16, 2020 · efb1234 · efb1234
2 parents cb72311 + 7523d29
commit efb1234
Show file tree

Hide file tree

Showing 49 changed files with 2,901 additions and 199 deletions.
diff --git a/generator-dao/pom.xml b/generator-dao/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.dingtalk.mybatis</groupId>
         <artifactId>mybatis-generator-tddl</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.dingtalk</groupId>
     <artifactId>generator-dao</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description>用于存储gui执行的页面保存数据，便于用户存储多个项目的不同配置</description>
 
 

diff --git a/generator-gui/pom.xml b/generator-gui/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>com.dingtalk.mybatis</groupId>
         <artifactId>mybatis-generator-tddl</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>com.dingtalk.mybatis</groupId>
     <artifactId>generator-gui</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description>界面配置工具</description>
 
 

diff --git a/generator-plugin/generator-plugin.iml b/generator-plugin/generator-plugin.iml
@@ -12,6 +12,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.2" level="project" />

diff --git a/generator-plugin/pom.xml b/generator-plugin/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.dingtalk.mybatis</groupId>
         <artifactId>mybatis-generator-tddl</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.dingtalk</groupId>
     <artifactId>generator-plugin</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <description>generator自定义调整方法</description>
 
     <dependencies>
@@ -22,6 +22,10 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>

diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/dao/TableOneUniqueKeyMapper.java b/generator-plugin/src/main/java/com/dingtalk/demo/dao/TableOneUniqueKeyMapper.java
@@ -18,6 +18,8 @@ public interface TableOneUniqueKeyMapper {
 
     List<TableOneUniqueKey> selectByExample(TableOneUniqueKeyCriteria example);
 
+    TableOneUniqueKey selectByExampleForUpdate(TableOneUniqueKeyCriteria example);
+
     TableOneUniqueKey selectByPrimaryKey(@Param("orgId") Long orgId, @Param("code") String code);
 
     int updateByExampleSelective(@Param("record") TableOneUniqueKey record, @Param("example") TableOneUniqueKeyCriteria example);
@@ -30,7 +32,13 @@ public interface TableOneUniqueKeyMapper {
 
     TableOneUniqueKey selectByUniqueKey(@Param("orgId") Long orgId, @Param("code") String code);
 
+    TableOneUniqueKey selectByUniqueKeyForUpdate(@Param("orgId") Long orgId, @Param("code") String code);
+
     int updateByUniqueKeySelective(TableOneUniqueKey record);
 
     int deleteByUniqueKey(@Param("orgId") Long orgId, @Param("code") String code);
+
+    int batchInsert(@Param("list") List<TableOneUniqueKey> list);
+
+    int upsertByUniqueKey(TableOneUniqueKey record);
 }
diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/dao/TableTwoUniqueKeyMapper.java b/generator-plugin/src/main/java/com/dingtalk/demo/dao/TableTwoUniqueKeyMapper.java
@@ -18,6 +18,8 @@ public interface TableTwoUniqueKeyMapper {
 
     List<TableTwoUniqueKey> selectByExample(TableTwoUniqueKeyCriteria example);
 
+    TableTwoUniqueKey selectByExampleForUpdate(TableTwoUniqueKeyCriteria example);
+
     TableTwoUniqueKey selectByPrimaryKey(@Param("orgId") Long orgId, @Param("code") String code);
 
     int updateByExampleSelective(@Param("record") TableTwoUniqueKey record, @Param("example") TableTwoUniqueKeyCriteria example);
@@ -30,7 +32,13 @@ public interface TableTwoUniqueKeyMapper {
 
     TableTwoUniqueKey selectByUniqueKey(@Param("orgId") Long orgId, @Param("cid") String cid);
 
+    TableTwoUniqueKey selectByUniqueKeyForUpdate(@Param("orgId") Long orgId, @Param("cid") String cid);
+
     int updateByUniqueKeySelective(TableTwoUniqueKey record);
 
     int deleteByUniqueKey(@Param("orgId") Long orgId, @Param("cid") String cid);
+
+    int batchInsert(@Param("list") List<TableTwoUniqueKey> list);
+
+    int upsertByUniqueKey(TableTwoUniqueKey record);
 }
diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/dao/TableWithIdentifyMapper.java b/generator-plugin/src/main/java/com/dingtalk/demo/dao/TableWithIdentifyMapper.java
@@ -0,0 +1,44 @@
+package com.dingtalk.demo.dao;
+
+import com.dingtalk.demo.domain.TableWithIdentify;
+import com.dingtalk.demo.domain.TableWithIdentifyCriteria;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TableWithIdentifyMapper {
+    long countByExample(TableWithIdentifyCriteria example);
+
+    int deleteByExample(TableWithIdentifyCriteria example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(TableWithIdentify record);
+
+    int insertSelective(TableWithIdentify record);
+
+    List<TableWithIdentify> selectByExample(TableWithIdentifyCriteria example);
+
+    TableWithIdentify selectByExampleForUpdate(TableWithIdentifyCriteria example);
+
+    TableWithIdentify selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") TableWithIdentify record, @Param("example") TableWithIdentifyCriteria example);
+
+    int updateByExample(@Param("record") TableWithIdentify record, @Param("example") TableWithIdentifyCriteria example);
+
+    int updateByPrimaryKeySelective(TableWithIdentify record);
+
+    int updateByPrimaryKey(TableWithIdentify record);
+
+    TableWithIdentify selectByUniqueKey(@Param("orgId") Long orgId, @Param("code") String code);
+
+    TableWithIdentify selectByUniqueKeyForUpdate(@Param("orgId") Long orgId, @Param("code") String code);
+
+    int updateByUniqueKeySelective(TableWithIdentify record);
+
+    int deleteByUniqueKey(@Param("orgId") Long orgId, @Param("code") String code);
+
+    int batchInsert(@Param("list") List<TableWithIdentify> list);
+
+    int upsertByUniqueKey(TableWithIdentify record);
+}
diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableOneUniqueKey.java b/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableOneUniqueKey.java
@@ -52,7 +52,7 @@ public class TableOneUniqueKey implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     private static final long serialVersionUID = 1L;
 }
diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableOneUniqueKeyCriteria.java b/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableOneUniqueKeyCriteria.java
@@ -9,26 +9,30 @@ public class TableOneUniqueKeyCriteria {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected String orderByClause;
 
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected boolean distinct;
 
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected List<Criteria> oredCriteria;
 
+    protected Integer start;
+
+    protected Integer limit;
+
     public TableOneUniqueKeyCriteria() {
         oredCriteria = new ArrayList<>();
     }
@@ -80,13 +84,42 @@ public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
+        start = null;
+        limit = null;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public Integer getStart() {
+        return this.start;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getLimit() {
+        return this.limit;
+    }
+
+    public TableOneUniqueKeyCriteria limit(Integer limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    public TableOneUniqueKeyCriteria limit(Integer start, Integer limit) {
+        this.start = start;
+        this.limit = limit;
+        return this;
     }
 
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -514,7 +547,7 @@ public Criteria andCidNotBetween(String value1, String value2) {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated do_not_delete_during_merge Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated do_not_delete_during_merge Fri Oct 16 14:39:21 CST 2020
      */
     public static class Criteria extends GeneratedCriteria {
         protected Criteria() {
@@ -526,7 +559,7 @@ protected Criteria() {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table table_one_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     public static class Criterion {
         private String condition;

diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableTwoUniqueKey.java b/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableTwoUniqueKey.java
@@ -52,7 +52,7 @@ public class TableTwoUniqueKey implements Serializable {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     private static final long serialVersionUID = 1L;
 }
diff --git a/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableTwoUniqueKeyCriteria.java b/generator-plugin/src/main/java/com/dingtalk/demo/domain/TableTwoUniqueKeyCriteria.java
@@ -9,26 +9,30 @@ public class TableTwoUniqueKeyCriteria {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected String orderByClause;
 
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected boolean distinct;
 
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected List<Criteria> oredCriteria;
 
+    protected Integer start;
+
+    protected Integer limit;
+
     public TableTwoUniqueKeyCriteria() {
         oredCriteria = new ArrayList<>();
     }
@@ -80,13 +84,42 @@ public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
+        start = null;
+        limit = null;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public Integer getStart() {
+        return this.start;
+    }
+
+    public void setLimit(Integer limit) {
+        this.limit = limit;
+    }
+
+    public Integer getLimit() {
+        return this.limit;
+    }
+
+    public TableTwoUniqueKeyCriteria limit(Integer limit) {
+        this.limit = limit;
+        return this;
+    }
+
+    public TableTwoUniqueKeyCriteria limit(Integer start, Integer limit) {
+        this.start = start;
+        this.limit = limit;
+        return this;
     }
 
     /**
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
@@ -514,7 +547,7 @@ public Criteria andCidNotBetween(String value1, String value2) {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated do_not_delete_during_merge Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated do_not_delete_during_merge Fri Oct 16 14:39:21 CST 2020
      */
     public static class Criteria extends GeneratedCriteria {
         protected Criteria() {
@@ -526,7 +559,7 @@ protected Criteria() {
      * This class was generated by MyBatis Generator.
      * This class corresponds to the database table table_two_unique_key
      *
-     * @mbg.generated Thu Oct 15 16:54:39 CST 2020
+     * @mbg.generated Fri Oct 16 14:39:21 CST 2020
      */
     public static class Criterion {
         private String condition;