From 437d1568801f1a67667b0b2e218f29c8e208e614 Mon Sep 17 00:00:00 2001
From: Vr80s <tofenglu@gmail.com>
Date: Thu, 23 May 2019 01:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EDO=E3=80=81Mapper=E3=80=81Dao?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

EntityNaming、XMLMapperNaming、MapperInterfaceNaming、DaoNaming
注意：原DoMapperName参数已经失效，后续删除
---
 .../mybatis/gen/dataloaders/DalgenLoader.java | 22 +++++++++++++------
 .../cn/dalgen/mybatis/gen/model/Config.java   |  7 +++++-
 .../mybatis/gen/model/java/DOMapper.java      |  9 ++++++++
 src/main/resources/dalgen/config/config.xml   | 14 +++++++++++-
 .../dalgen/templates/dalgen/XMLMapper.xml.ftl |  2 +-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cn/dalgen/mybatis/gen/dataloaders/DalgenLoader.java b/src/main/java/cn/dalgen/mybatis/gen/dataloaders/DalgenLoader.java
index 26d0488..384bd3c 100755
--- a/src/main/java/cn/dalgen/mybatis/gen/dataloaders/DalgenLoader.java
+++ b/src/main/java/cn/dalgen/mybatis/gen/dataloaders/DalgenLoader.java
@@ -336,7 +336,9 @@ public class DalgenLoader extends AbstractDalgenLoader {
     private DAO preDAO(Gen gen, CfTable cfTable, Table table, DO doClass,
                        Map<String, ResultMap> resultMaps) {
         DAO dao = new DAO();
-        dao.setClassName(table.getJavaName() + "DAO");
+        String daoNaming = ConfigUtil.getConfig().getExtParam("DaoNaming");
+        String daoClazzName = daoNaming.replace("[EntityName]", table.getJavaName());
+        dao.setClassName(daoClazzName);
 
         dao.setPackageName(ConfigUtil.getCurrentDb().getGenPackage("dao"));
 
@@ -464,11 +466,14 @@ public class DalgenLoader extends AbstractDalgenLoader {
     private DOMapper preDOMapper(Gen gen, CfTable cfTable, Table table, DO doClass,
                                  Map<String, ResultMap> resultMaps) {
         DOMapper doMapper = new DOMapper();
-        if (StringUtils.equals("DO", ConfigUtil.getConfig().getExtParam("DoMapperName"))) {
-            doMapper.setClassName(doClass.getClassName() + "Mapper");
-        }else{
-            doMapper.setClassName(table.getJavaName()+ "Mapper");
-        }
+        String mapperInterfaceNaming = ConfigUtil.getConfig().getExtParam("MapperInterfaceNaming");
+        String doMapperClazzName = mapperInterfaceNaming.replace("[EntityName]", table.getJavaName());
+        doMapper.setClassName(doMapperClazzName);
+
+        String xmlMapperNaming = ConfigUtil.getConfig().getExtParam("XMLMapperNaming");
+        String xmlFileName = xmlMapperNaming.replace("[EntityName]", table.getJavaName());
+        doMapper.setXmlFileName(xmlFileName);
+
         doMapper.setPackageName(ConfigUtil.getCurrentDb().getGenPackage("mapper"));
         doMapper.setXmlPackageName(ConfigUtil.getCurrentDb().getGenPackage("mapper.xml"));
         doMapper.setDesc(cfTable.getRemark());
@@ -792,7 +797,10 @@ public class DalgenLoader extends AbstractDalgenLoader {
      */
     private DO preDo(Table table, List<CfColumn> cfColumns) {
         DO doClass = new DO();
-        doClass.setClassName(table.getJavaName() + "DO");
+        String entityNaming = ConfigUtil.getConfig().getExtParam("EntityNaming");
+        String doClazzName = entityNaming.replace("[EntityName]", table.getJavaName());
+        doClass.setClassName(doClazzName);
+
         doClass.setPackageName(ConfigUtil.getCurrentDb().getGenPackage("dataobject"));
         doClass.setDesc(table.getRemark());
         doClass.setTableName(table.getSqlName());
diff --git a/src/main/java/cn/dalgen/mybatis/gen/model/Config.java b/src/main/java/cn/dalgen/mybatis/gen/model/Config.java
index 54a46c1..97631e7 100755
--- a/src/main/java/cn/dalgen/mybatis/gen/model/Config.java
+++ b/src/main/java/cn/dalgen/mybatis/gen/model/Config.java
@@ -45,7 +45,12 @@ public class Config {
     private Map<String, String> extParamMap = Maps.newHashMap();
     {
         extParamMap.put("Repository","true");
-        extParamMap.put("DoMapperName","DO");
+        extParamMap.put("DoMapperName","DO"); // 废弃 by Vr80s 2019-05-23
+        // 生成文件命名规则参数 by Vr80s 2019-05-23
+        extParamMap.put("EntityNaming","[EntityName]DO");
+        extParamMap.put("XMLMapperNaming","[EntityName]DOMapper");
+        extParamMap.put("MapperInterfaceNaming","[EntityName]DOMapper");
+        extParamMap.put("DaoNaming","[EntityName]DAO");
     }
     /**
      * 软删除字段
diff --git a/src/main/java/cn/dalgen/mybatis/gen/model/java/DOMapper.java b/src/main/java/cn/dalgen/mybatis/gen/model/java/DOMapper.java
index 30ca5b5..1a6ab19 100755
--- a/src/main/java/cn/dalgen/mybatis/gen/model/java/DOMapper.java
+++ b/src/main/java/cn/dalgen/mybatis/gen/model/java/DOMapper.java
@@ -11,8 +11,17 @@ import java.util.List;
  */
 public class DOMapper extends Base {
 
+    private String xmlFileName;
     private String xmlPackageName;
 
+    public String getXmlFileName() {
+        return StringUtils.isBlank(xmlFileName) ? getClassName() : xmlFileName;
+    }
+
+    public void setXmlFileName(String xmlFileName) {
+        this.xmlFileName = xmlFileName;
+    }
+
     public String getXmlPackageName() {
         return StringUtils.isBlank(xmlPackageName)?getPackageName():xmlPackageName;
     }
diff --git a/src/main/resources/dalgen/config/config.xml b/src/main/resources/dalgen/config/config.xml
index ee85be4..7e9c359 100755
--- a/src/main/resources/dalgen/config/config.xml
+++ b/src/main/resources/dalgen/config/config.xml
@@ -87,8 +87,20 @@
         <!-- insert update delete 返回结果 -->
         <extParam name="IUD" value="Long"/>
         <!-- DOMapp name中默认出现DO，如需不出现则将DO去掉即可  -->
-        <extParam name="DoMapperName" value="DO"/>
+        <!--
+        <extParam name="DoMapperName" value="DO"/> <== 废弃 by Vr80s 2019-05-23
+        -->
         <!--默认DAO中方法参数排序，设定为false时与xml模板中顺序一致-->
         <extParam name="MethodParamSort" value="true"/>
+
+        <!-- 新增参数 by Vr80s 2019-05-23 -->
+        <!-- 实体类命名规则 默认值："[EntityName]DO" -->
+        <extParam name="EntityNaming" value="[EntityName]DO" />
+        <!-- Mapper Xml文件命名规则 默认值: "[EntityName]DOMapper" -->
+        <extParam name="XMLMapperNaming" value="[EntityName]DOMapper" />
+        <!-- Mapper接口命名规则 默认值: "[EntityName]DOMapper" -->
+        <extParam name="MapperInterfaceNaming" value="[EntityName]DOMapper" />
+        <!-- Dao命名规则 默认值: "[EntityName]DAO" -->
+        <extParam name="DaoNaming" value="[EntityName]DAO" />
     </extParams>
 </config>
diff --git a/src/main/resources/dalgen/templates/dalgen/XMLMapper.xml.ftl b/src/main/resources/dalgen/templates/dalgen/XMLMapper.xml.ftl
index 4acdc18..f2206b5 100755
--- a/src/main/resources/dalgen/templates/dalgen/XMLMapper.xml.ftl
+++ b/src/main/resources/dalgen/templates/dalgen/XMLMapper.xml.ftl
@@ -3,7 +3,7 @@
 <#import "../lib/function.ftl" as fun/>
 <#import "../lib/macro.ftl" as m>
 <#list dalgen.xmlMappers as xmlMapper>
-<@pp.changeOutputFile name = "/main/resources/${xmlMapper.doMapper.xmlPath}/${xmlMapper.doMapper.className}.xml" />
+<@pp.changeOutputFile name = "/main/resources/${xmlMapper.doMapper.xmlPath}/${xmlMapper.doMapper.xmlFileName}.xml" />
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="${xmlMapper.doMapper.packageName}.${xmlMapper.doMapper.className}">
-- 
Gitee