新增mapper2(Mybatis-Annotation模板)(感谢@baisi525和@CHKEGit的建议)

moshowgame · moshowgame · commit b30ce868ff8b · 2020-05-18T00:18:36.000+08:00
diff --git a/README.md b/README.md
@@ -7,10 +7,16 @@
 
 # Description
 - √ 基于SpringBoot2+Freemarker+Bootstrap
-- √ 以释放双手为目的
+- √ 以解放双手为目的，减少大量重复的CRUD工作
 - √ 支持mysql/oracle/pgsql三大数据库
 - √ 用DDL-SQL语句生成JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL相关代码.
 
+# Advantage 
+- 自动记忆最近生成的内容，最多保留9个
+- 支持特殊字符模板(`#`请用`井`代替;`$`请用`￥`代替)
+- 提供众多通用模板，易于使用，复制粘贴加简单修改即可完成CRUD操作
+- 支持JSON逆向生成(只支持简单的一级树)
+
 
 # Url
 
@@ -20,14 +26,14 @@
 |CSDN博客|http://zhengkai.blog.csdn.net|
 |最新Jar包|https://github.com/moshowgame/SpringBootCodeGenerator/releases|
 
-感谢bejson三叔将他部署在[BEJSON](www.bejson.com)上，目前是besjon专供工具(线上版本不一定是最新的，会有延迟，请谅解，谢谢).
+感谢bejson三叔将他部署在[BEJSON](www.bejson.com)上，目前是besjon专供的金牌工具(线上版本不一定是最新的，会有延迟，请谅解，谢谢).
 
 
 # Update
 
 |更新日期|更新内容|
 |-|-|
-|20200517|1.代码重构！异常处理优化，Freemarker相关工具类优化，简化模板生成部分，通过template.json来配置需要生成的模板，不需要配置java文件。 2.修复包含comment关键字时注释无法识别的问题。(感谢@1nchaos的反馈) 3.赞赏优化，感谢大家的赞赏|
+|20200517|1.代码重构！异常处理优化，Freemarker相关工具类优化，简化模板生成部分，通过template.json来配置需要生成的模板，不需要配置java文件。 2.修复包含comment关键字时注释无法识别的问题。(感谢@1nchaos的反馈) 3.赞赏优化，感谢大家的赞赏 4.新增mapper2(Mybatis-Annotation模板)(感谢@baisi525和@CHKEGit的建议)。|
 |20200503|1.优化对特殊字符的处理，对于包含#和$等特殊字符的，在模板使用井和￥代替便可，escapeString方法会自动处理<br> 2.优化mybatisplus实体类相关(感谢@chunchengmeigui的反馈) 3.修优化对所有类型的判断(感谢@cnlw的反馈) 4.移除swagger-entity，该功能已经包含在‘swagger-ui’的下拉选项中  5.升级hutool和lombok版本|
 |20200306|1.提交一套layuimini+mybatisplus的模板. 2.修复mybatisplus一些相关问题. |
 |20200206|1.新增历史记录功能，自动保存最近生成的对象 2.新增swagger开关选项和修复@Column带name参数(感谢@liuyu-struggle的建议) 3.去除mybatis模板中的方括号[]和修改模板里的类注释样式(感谢@gaohanghang的PR)|
diff --git a/generator-web/src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java b/generator-web/src/main/java/com/softdev/system/generator/util/FreemarkerUtil.java
@@ -31,7 +31,7 @@ public class FreemarkerUtil {
      * 传入需要转义的字符串进行转义
      * 20200503 zhengkai.blog.csdn.net
      * */
-    public String escapeString(String originStr){
+    public static String escapeString(String originStr){
         return originStr.replaceAll("井","\\#").replaceAll("￥","\\$");
     }
 
@@ -88,7 +88,7 @@ public static String processString(String templateName, Map<String, Object> para
             throws IOException, TemplateException {
 
         Template template = freemarkerConfig.getTemplate(templateName);
-        String htmlText = processTemplateIntoString(template, params);
+        String htmlText = escapeString(processTemplateIntoString(template, params));
         return htmlText;
     }
 
diff --git a/generator-web/src/main/resources/template.json b/generator-web/src/main/resources/template.json
@@ -65,6 +65,12 @@
     "group": "mybatis",
     "description": "model"
   },
+  {
+    "id": "26",
+    "name": "mapper2",
+    "group": "mybatis",
+    "description": "mapper annotation"
+  },
   {
     "id": "30",
     "name": "entity",
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis-plus/plusentity.ftl
@@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
  * @author ${authorName}
  * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
  */
-@Data
-<#if swagger?exists && swagger==true>@ApiModel("${classInfo.classComment}")</#if>
+@Data<#if swagger?exists && swagger==true>
+@ApiModel("${classInfo.classComment}")</#if>
 public class ${classInfo.className} implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl b/generator-web/src/main/resources/templates/code-generator/mybatis/mapper2.ftl
@@ -0,0 +1,56 @@
+package ${packageName}.mapper;
+
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+/**
+ * @description ${classInfo.classComment}Mapper
+ * @author ${authorName}
+ * @date ${.now?string('yyyy-MM-dd HH:mm:ss')}
+ */
+@Mapper
+@Repository
+public interface ${classInfo.className}Mapper {
+
+    @Select("select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{id}")
+    public ${classInfo.className} getById(Integer id);
+
+    @Options(useGeneratedKeys=true,keyProperty="${classInfo.className?uncap_first}Id")
+    @Insert("insert into ${classInfo.tableName}"
+            "(<#list classInfo.fieldList as fieldItem >${fieldItem.columnName}<#if fieldItem_has_next>,</#if></#list>)"
+            "values(<#list classInfo.fieldList as fieldItem >${fieldItem.fieldName}<#if fieldItem_has_next>,</#if>)</#list>")
+    public Integer insert(${classInfo.className} ${classInfo.className?uncap_first});
+
+    @Delete(value = "delete from ${classInfo.tableName} where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id}")
+    boolean delete(Integer id);
+
+    @Update(value = "update ${classInfo.tableName} set "
+    <#list classInfo.fieldList as fieldItem >
+        <#if fieldItem.columnName != "id">+" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next>,</#if>"</#if>
+    </#list>
+        +" where ${classInfo.tableName}_id=井{${classInfo.className?uncap_first}Id} ")
+    boolean update(${classInfo.className} ${classInfo.className?uncap_first});
+
+
+    @Results(value = {
+    <#list classInfo.fieldList as fieldItem >
+        @Result(property = "${fieldItem.fieldName}", column = "${fieldItem.columnName}")<#if fieldItem_has_next>,</#if>
+    </#list>
+    })
+    @Select(value = "select * from ${classInfo.tableName} where ${classInfo.tableName}_id=井{queryParam}")
+    ${classInfo.className} selectOne(String queryParam);
+
+    @Results(value = {
+    <#list classInfo.fieldList as fieldItem >
+        @Result(property = "${fieldItem.fieldName}", column = "${fieldItem.columnName}")<#if fieldItem_has_next>,</#if>
+    </#list>
+    })
+    @Select(value = "select * from ${classInfo.tableName} where "
+    <#list classInfo.fieldList as fieldItem >
+        +" ${fieldItem.columnName}=井{${fieldItem.fieldName}}<#if fieldItem_has_next> or </#if>"
+    </#list>
+    )
+    List<${classInfo.className}> selectList(${classInfo.className} ${classInfo.className?uncap_first});
+
+}
diff --git a/generator-web/src/main/resources/templates/index.ftl b/generator-web/src/main/resources/templates/index.ftl
@@ -217,7 +217,9 @@
     <div class="container">
         <h2>Spring Boot Code Generator!</h2>
         <p class="lead">
-            √基于SpringBoot2+Freemarker的<a class="lead" href="https://github.com/moshowgame/SpringBootCodeGenerator">代码生成器</a>，√以释放双手为目的，√支持mysql/oracle/pgsql三大数据库，<br>
+            √基于SpringBoot2+Freemarker的<a class="lead" href="https://github.com/moshowgame/SpringBootCodeGenerator">代码生成器</a><br>
+            √以解放双手为目的，减少大量重复的CRUD工作<br>
+            √支持mysql/oracle/pgsql三大数据库<br>
             √用DDL-SQL语句生成JPA/JdbcTemplate/Mybatis/MybatisPlus/BeetlSQL相关代码。<br>
             如果发现有SQL语句不能识别，请<a href="https://github.com/moshowgame/SpringBootCodeGenerator/issues">留言</a>，同时欢迎大家提<a href="https://github.com/moshowgame/SpringBootCodeGenerator/pulls">PR</a>和<a href="#" id="donate1">赞赏</a>，谢谢！<a id="version" href="#">查看版本</a>
         </p>
@@ -279,7 +281,7 @@
         <textarea id="ddlSqlArea" placeholder="请输入表结构信息..." class="form-control btn-lg" style="height: 250px;">
 CREATE TABLE 'userinfo' (
   'user_id' int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-  'username' varchar(255) NOT NULL COMMENT '用户名',
+  'user_name' varchar(255) NOT NULL COMMENT '用户名',
   'addtime' datetime NOT NULL COMMENT '创建时间',
   PRIMARY KEY ('user_id')
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息'
@@ -307,10 +309,11 @@ CREATE TABLE 'userinfo' (
                     </div>
                 </div>
                 <div class="btn-group" role="group" aria-label="First group">
-                    <button type="button" class="btn btn-default generator" id="mybatis">mybatis</button>
+                    <button type="button" class="btn btn-default generator" id="mybatis">ibatisXml</button>
                     <button type="button" class="btn btn-default generator" id="mapper">mapper</button>
+                    <button type="button" class="btn btn-default generator" id="mapper2">mapper2</button>
                     <button type="button" class="btn btn-default generator" id="service">service</button>
-                    <button type="button" class="btn btn-default generator" id="service_impl">service_impl</button>
+                    <button type="button" class="btn btn-default generator" id="service_impl">serviceImpl</button>
                     <button type="button" class="btn btn-default generator" id="controller">controller</button>
                 </div>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public class FreemarkerUtil {`
`31`	`31`	`* 传入需要转义的字符串进行转义`
`32`	`32`	`* 20200503 zhengkai.blog.csdn.net`
`33`	`33`	`* */`
`34`		`- public String escapeString(String originStr){`
	`34`	`+ public static String escapeString(String originStr){`
`35`	`35`	`return originStr.replaceAll("井","\\#").replaceAll("￥","\\$");`
`36`	`36`	`}`
`37`	`37`
`@@ -88,7 +88,7 @@ public static String processString(String templateName, Map<String, Object> para`
`88`	`88`	`throws IOException, TemplateException {`
`89`	`89`
`90`	`90`	`Template template = freemarkerConfig.getTemplate(templateName);`
`91`		`- String htmlText = processTemplateIntoString(template, params);`
	`91`	`+ String htmlText = escapeString(processTemplateIntoString(template, params));`
`92`	`92`	`return htmlText;`
`93`	`93`	`}`
`94`	`94`