优化资源结构，代码生成器结构

src/main/resources/mapping/bus/SysDicMapper.xml

@@ -0,0 +1,19 @@
+<?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="com.gxzc.zen.api.bus.mapper.SysDicMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.SysDic">
+    <result column="id" property="id" />
+    <result column="enable" property="enable" />
+    <result column="remark" property="remark" />
+    <result column="create_time" property="createTime" />
+    <result column="create_by" property="createBy" />
+    <result column="update_time" property="updateTime" />
+    <result column="update_by" property="updateBy" />
+        <result column="key" property="key" />
+        <result column="value" property="value" />
+        <result column="sort" property="sort" />
+    </resultMap>
+
+</mapper>

zen-api/src/main/java/com/gxzc/zen/api/bus/mapper/SysDicMapper.java

@@ -0,0 +1,15 @@
+package com.gxzc.zen.api.bus.mapper;
+
+import com.gxzc.zen.api.bus.model.SysDic;
+import com.gxzc.zen.common.base.BaseMapper;
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-01-30
+ */
+public interface SysDicMapper extends BaseMapper<SysDic> {
+
+}

zen-api/src/main/java/com/gxzc/zen/api/bus/model/SysDic.java

@@ -0,0 +1,63 @@
+package com.gxzc.zen.api.bus.model;
+
+import com.gxzc.zen.common.base.BaseModel;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-01-30
+ */
+public class SysDic extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典代码
+     */
+    private String key;
+    /**
+     * 字典值
+     */
+    private String value;
+    /**
+     * 排序号
+     */
+    private Integer sort;
+
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    @Override
+    public String toString() {
+        return "SysDic{" +
+        ", key=" + key +
+        ", value=" + value +
+        ", sort=" + sort +
+        "}";
+    }
+}

zen-api/src/main/java/com/gxzc/zen/api/bus/service/ISysDicService.java

@@ -0,0 +1,15 @@
+package com.gxzc.zen.api.bus.service;
+
+import com.gxzc.zen.api.bus.model.SysDic;
+import com.gxzc.zen.common.base.BaseService;
+/**
+ * <p>
+ * 字典表 服务类
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-01-30
+ */
+public interface ISysDicService extends BaseService<SysDic> {
+
+}

zen-api/src/main/java/com/gxzc/zen/api/bus/service/impl/SysDicServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gxzc.zen.api.bus.service.impl;
+
+import com.gxzc.zen.api.bus.model.SysDic;
+import com.gxzc.zen.api.bus.mapper.SysDicMapper;
+import com.gxzc.zen.api.bus.service.ISysDicService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 字典表 服务实现类
+ * </p>
+ *
+ * @author NorthLan123
+ * @since 2018-01-30
+ */
+@Service
+public class SysDicServiceImpl extends ServiceImpl<SysDicMapper, SysDic> implements ISysDicService {
+
+}

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/mapper/SysDicMapper.kt

@@ -1,18 +1,13 @@
-package com.gxzc.zen.api.bus.mapper;
-
-import com.gxzc.zen.api.bus.model.SysDic;
-import com.gxzc.zen.common.base.BaseMapper;
-import org.springframework.stereotype.Repository
+package com.gxzc.zen.api.bus.mapper
 
+import com.gxzc.zen.api.bus.model.SysDic
+import com.gxzc.zen.common.base.BaseMapper
 /**
  * <p>
  * 字典表 Mapper 接口
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-27
+ * @since 2018-01-30
  */
-@Repository
-interface SysDicMapper : BaseMapper<SysDic>{
-    fun custom(): Long
-}
+interface SysDicMapper : BaseMapper<SysDic>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/model/SysDic.kt

@@ -1,6 +1,6 @@
-package com.gxzc.zen.api.bus.model;
+package com.gxzc.zen.api.bus.model
 
-import com.gxzc.zen.common.base.BaseModel;
+import com.gxzc.zen.common.base.BaseModel
 
 /**
  * <p>
@@ -8,29 +8,20 @@ import com.gxzc.zen.common.base.BaseModel;
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-27
+ * @since 2018-01-30
  */
-class SysDic : BaseModel() {
-
-    /**
-     * 字典代码
-     */
-    var key: String? = null
-    /**
-     * 字典值
-     */
-    var value: String? = null
-    /**
-     * 排序号
-     */
-    var sort: Integer? = null
-
-
-    override fun toString(): String {
-        return "SysDic{" +
-        ", key=" + key +
-        ", value=" + value +
-        ", sort=" + sort +
-        "}"
-    }
+data class SysDic(
+        /**
+         * 字典代码
+         */
+        var key: String? = null,
+        /**
+         * 字典值
+         */
+        var value: String? = null,
+        /**
+         * 排序号
+         */
+        var sort: Int? = null
+) : BaseModel() {
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/ISysDicService.kt

@@ -1,16 +1,13 @@
-package com.gxzc.zen.api.bus.service;
-
-import com.gxzc.zen.api.bus.model.SysDic;
-import com.gxzc.zen.common.base.BaseService;
+package com.gxzc.zen.api.bus.service
 
+import com.gxzc.zen.api.bus.model.SysDic
+import com.gxzc.zen.common.base.BaseService
 /**
  * <p>
  * 字典表 服务类
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-27
+ * @since 2018-01-30
  */
-interface ISysDicService : BaseService<SysDic>{
-    fun custom(): Long
-}
+interface ISysDicService : BaseService<SysDic>

zen-api/src/main/kotlin/com/gxzc/zen/api/bus/service/impl/SysDicServiceImpl.kt

@@ -1,10 +1,10 @@
-package com.gxzc.zen.api.bus.service.impl;
+package com.gxzc.zen.api.bus.service.impl
 
-import com.gxzc.zen.api.bus.model.SysDic;
-import com.gxzc.zen.api.bus.mapper.SysDicMapper;
-import com.gxzc.zen.api.bus.service.ISysDicService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.gxzc.zen.api.bus.model.SysDic
+import com.gxzc.zen.api.bus.mapper.SysDicMapper
+import com.gxzc.zen.api.bus.service.ISysDicService
+import com.baomidou.mybatisplus.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
 
 /**
  * <p>
@@ -12,12 +12,9 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author NorthLan123
- * @since 2018-01-27
+ * @since 2018-01-30
  */
 @Service
 open class SysDicServiceImpl : ServiceImpl<SysDicMapper, SysDic>(), ISysDicService {
-    override fun custom(): Long {
-        return baseMapper.custom()
-    }
 
 }

zen-api/src/main/kotlin/com/gxzc/zen/api/sys/model/SysDept.kt

@@ -10,27 +10,17 @@ import com.gxzc.zen.common.base.BaseModel;
  * @author NorthLan123
  * @since 2018-01-27
  */
-class SysDept : BaseModel() {
-
-    /**
-     * 部门名称
-     */
-    var deptName: String? = null
-    /**
-     * 负责人
-     */
-    var principal: String? = null
-    /**
-     * 排序号
-     */
-    var sort: Integer? = null
-
-
-    override fun toString(): String {
-        return "SysDept{" +
-        ", deptName=" + deptName +
-        ", principal=" + principal +
-        ", sort=" + sort +
-        "}"
-    }
-}
+data class SysDept(
+        /**
+         * 部门名称
+         */
+        var deptName: String? = null,
+        /**
+         * 负责人
+         */
+        var principal: String? = null,
+        /**
+         * 排序号
+         */
+        var sort: Integer? = null
+) : BaseModel()

zen-api/src/main/resources/mapping/bus/SysDicMapper.xml

@@ -4,20 +4,16 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.gxzc.zen.api.bus.model.SysDic">
-        <result column="id" property="id"/>
-        <result column="enable" property="enable"/>
-        <result column="remark" property="remark"/>
-        <result column="create_time" property="createTime"/>
-        <result column="create_by" property="createBy"/>
-        <result column="update_time" property="updateTime"/>
-        <result column="update_by" property="updateBy"/>
-        <result column="key" property="key"/>
-        <result column="value" property="value"/>
-        <result column="sort" property="sort"/>
+    <result column="id" property="id" />
+    <result column="enable" property="enable" />
+    <result column="remark" property="remark" />
+    <result column="create_time" property="createTime" />
+    <result column="create_by" property="createBy" />
+    <result column="update_time" property="updateTime" />
+    <result column="update_by" property="updateBy" />
+        <result column="key" property="key" />
+        <result column="value" property="value" />
+        <result column="sort" property="sort" />
     </resultMap>
 
-    <select id="custom" resultType="java.lang.Long">
-        SELECT count(*) from sys_dic
-    </select>
-
 </mapper>

zen-orm/src/main/kotlin/com/gxzc/zen/Generator.kt

@@ -1,8 +1,10 @@
 package com.gxzc.zen
 
 import com.baomidou.mybatisplus.generator.AutoGenerator
+import com.baomidou.mybatisplus.generator.InjectionConfig
 import com.baomidou.mybatisplus.generator.config.*
 import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert
+import com.baomidou.mybatisplus.generator.config.po.TableInfo
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType
 import com.baomidou.mybatisplus.generator.config.rules.DbType
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy
@@ -14,76 +16,96 @@ import java.io.File
  * @date 2018/1/24
  * @url https://noahlan.me
  */
-fun main(args: Array<String>) {
+
+fun generate(isKotlin: Boolean, author: String, pkgType: String, dataSourceConfig: DataSourceConfig) {
     val mpg = AutoGenerator()
 
     val path = File("zen-api").absolutePath
 
     // 全局配置
-    val gc = GlobalConfig()
-    with(gc) {
-        outputDir = path + "/src/main/kotlin"
-        isFileOverride = true
-        isActiveRecord = false
-        isEnableCache = false
-        isOpen = false
-        author = "NorthLan"
-        isKotlin = true
-        isBaseResultMap = true
-        mapperName = "%sMapper"
-        xmlName = "%sMapper"
-        serviceName = "I%sService"
-        serviceImplName = "%sServiceImpl"
+    mpg.globalConfig = GlobalConfig().also {
+        it.outputDir = if (isKotlin) {
+            "$path/src/main/kotlin"
+        } else {
+            "$path/src/main/java"
+        }
+        it.isFileOverride = true
+        it.isActiveRecord = false
+        it.isEnableCache = false
+        it.isOpen = false
+        it.author = author
+        it.isKotlin = isKotlin
+        it.isBaseResultMap = true
+        it.isBaseColumnList = false
+        it.mapperName = "%sMapper"
+        it.xmlName = "%sMapper"
+        it.serviceName = "I%sService"
+        it.serviceImplName = "%sServiceImpl"
     }
-    mpg.globalConfig = gc
 
     // 数据源
-    val dataSource = DataSourceConfig()
-    with(dataSource) {
-        dbType = DbType.MYSQL
-//        typeConvert = object :MySqlTypeConvert(){
-//            override fun processTypeConvert(fieldType: String?): DbColumnType {
-//                if(fieldType == "tinyint"){
-//                    return DbColumnType.BOOLEAN
-//                }
-//                return super.processTypeConvert(fieldType)
-//            }
-//        }
-        driverName = "com.mysql.jdbc.Driver"
-        username = "root"
-        password = "root"
-        url = "jdbc:mysql://127.0.0.1:3306/archives_rec?characterEncoding=utf8"
-    }
-    mpg.dataSource = dataSource
+    mpg.dataSource = dataSourceConfig
 
     // 策略配置
-    val strategy = StrategyConfig()
-    with(strategy) {
-        setDbColumnUnderline(true)
-        isCapitalMode = false
-        naming = NamingStrategy.underline_to_camel
+    mpg.strategy = StrategyConfig().also {
+        it.setDbColumnUnderline(true)
+        it.isCapitalMode = false
+        it.naming = NamingStrategy.underline_to_camel
         //            setTablePrefix()
-        superEntityClass = "com.gxzc.zen.common.base.BaseModel"
-        setSuperEntityColumns("id", "create_by", "create_time", "update_by", "update_time", "remark", "enable")
-        superMapperClass = "com.gxzc.zen.common.base.BaseMapper"
-        superServiceClass = "com.gxzc.zen.common.base.BaseService"
-        superServiceImplClass = "com.baomidou.mybatisplus.service.impl.ServiceImpl"
+        it.superEntityClass = "com.gxzc.zen.common.base.BaseModel"
+        it.setSuperEntityColumns("id", "create_by", "create_time", "update_by", "update_time", "remark", "enable")
+        it.superMapperClass = "com.gxzc.zen.common.base.BaseMapper"
+        it.superServiceClass = "com.gxzc.zen.common.base.BaseService"
+        it.superServiceImplClass = "com.baomidou.mybatisplus.service.impl.ServiceImpl"
 //            superControllerClass = ""
 //        setInclude("user")
-        isEntityBooleanColumnRemoveIsPrefix = true
-        logicDeleteFieldName = "enable"
+        it.isEntityBooleanColumnRemoveIsPrefix = true
+        it.logicDeleteFieldName = "enable"
 //            setExclude("")
     }
-    mpg.strategy = strategy
 
     // 包配置
-    val pc = PackageConfig()
-    with(pc) {
-        parent = "com.gxzc.zen.api.bus"
-//        moduleName = "zen-orm"
-        entity = "model"
+    mpg.packageInfo = PackageConfig().also {
+        it.parent = "com.gxzc.zen.api.$pkgType"
+        it.entity = "model"
+    }
+
+
+    val cfg = object : InjectionConfig() {
+        override fun initMap() {
+        }
+    }.also {
+        it.fileOutConfigList = ArrayList<FileOutConfig>().also {
+            it.add(object : FileOutConfig("/templates/mapper.xml.vm") {
+                override fun outputFile(tableInfo: TableInfo?): String {
+                    return "$path/src/main/resources/mapping/$pkgType/${tableInfo?.mapperName}.xml"
+                }
+            })
+        }
+    }
+
+    mpg.cfg = cfg
+
+    mpg.template = TemplateConfig().also {
+        it.controller = null // 不生成controller
+        it.xml = null
     }
-    mpg.packageInfo = pc
 
     mpg.execute()
 }
+
+fun main(args: Array<String>) {
+    generate(false, "NorthLan", "bus", DataSourceConfig().also {
+        it.dbType = DbType.MYSQL
+        it.typeConvert = object : MySqlTypeConvert() {
+            override fun processTypeConvert(fieldType: String?): DbColumnType {
+
+                return super.processTypeConvert(fieldType)
+            }
+        }
+        it.driverName = "com.mysql.jdbc.Driver"
+        it.username = "root"
+        it.password = "root"
+        it.url = "jdbc:mysql://127.0.0.1:3306/archives_rec?characterEncoding=utf8"
+    })
+}

zen-orm/src/main/kotlin/com/gxzc/zen/GeneratorMain.kt

@@ -1,9 +0,0 @@
-package com.gxzc.zen
-
-/**
- * 代码生成器入口方法
- * @author NorthLan at 2018/1/25
- */
-fun main(args: Array<String>) {
-
-}

zen-orm/src/main/resources/templates/entity.kt.vm

@@ -0,0 +1,92 @@
+package ${package.Entity}
+
+#foreach($pkg in ${table.importPackages})
+import ${pkg}
+#end
+
+/**
+ * <p>
+ * $!{table.comment}
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+#if(${table.convert})
+@TableName("${table.name}")
+#end
+data class ${entity}(
+## ----------  BEGIN 字段循环遍历  ----------
+#foreach($field in ${table.fields})
+#if(${field.keyFlag})
+    #set($keyPropertyName=${field.propertyName})
+#end
+#if("$!field.comment" != "")
+        /**
+         * ${field.comment}
+         */
+#end
+#if(${field.keyFlag})
+## 主键
+#if(${field.keyIdentityFlag})
+        @TableId(value = "${field.name}", type = IdType.AUTO)
+#elseif(!$null.isNull(${idType}) && "$!idType" != "")
+        @TableId(value = "${field.name}", type = IdType.${idType})
+#elseif(${field.convert})
+        @TableId("${field.name}")
+#end
+## 普通字段
+#elseif(${field.fill})
+## -----   存在字段填充设置   -----
+#if(${field.convert})
+        @TableField(value = "${field.name}", fill = FieldFill.${field.fill})
+#else
+        @TableField(fill = FieldFill.${field.fill})
+#end
+#elseif(${field.convert})
+        @TableField("${field.name}")
+#end
+## 乐观锁注解
+#if(${versionFieldName}==${field.name})
+        @Version
+#end
+## 逻辑删除注解
+#if(${logicDeleteFieldName}==${field.name})
+        @TableLogic
+#end
+        var ${field.propertyName}: ${field.propertyType}? = null#if($foreach.count!=${table.fields.size()}),#end
+
+#end
+## ----------  END 字段循环遍历  ----------
+) : #if(${superEntityClass})${superEntityClass}#if(${activeRecord})<${entity}>#end() {
+#elseif(${activeRecord}) Model<${entity}>() {
+#else Serializable {
+#end
+#if(${entityColumnConstant})
+    companion object {
+    #foreach($field in ${table.fields})
+        const val ${field.name.toUpperCase()} : String = "${field.name}"
+    #end
+}
+#end
+#if(${activeRecord})
+    override fun pkVal(): Serializable {
+        #if(${keyPropertyName})
+        return ${keyPropertyName} !
+        #else
+        return id!!
+        #end
+    }
+#end
+##    override fun toString(): String {
+##        return "${entity}{" +
+###foreach($field in ${table.fields})
+###if($!{velocityCount}==1)
+##        "${field.propertyName}=" + ${field.propertyName} +
+###else
+##        ", ${field.propertyName}=" + ${field.propertyName} +
+###end
+###end
+##        "}"
+##    }
+}

zen-orm/src/main/resources/templates/mapper.java.vm

@@ -0,0 +1,22 @@
+package ${package.Mapper}#if(!${kotlin});#end
+
+
+import ${package.Entity}.${entity}#if(!${kotlin});#end
+
+import ${superMapperClassPackage}#if(!${kotlin});#end
+
+/**
+ * <p>
+ * $!{table.comment} Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+#if(${kotlin})
+interface ${table.mapperName} : ${superMapperClass}<${entity}>
+#else
+public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
+
+}
+#end

zen-orm/src/main/resources/templates/service.java.vm

@@ -0,0 +1,22 @@
+package ${package.Service}#if(!${kotlin});#end
+
+
+import ${package.Entity}.${entity}#if(!${kotlin});#end
+
+import ${superServiceClassPackage}#if(!${kotlin});#end
+
+/**
+ * <p>
+ * $!{table.comment} 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+#if(${kotlin})
+interface ${table.serviceName} : ${superServiceClass}<${entity}>
+#else
+public interface ${table.serviceName} extends ${superServiceClass}<${entity}> {
+
+}
+#end

zen-orm/src/main/resources/templates/serviceImpl.java.vm

@@ -0,0 +1,32 @@
+package ${package.ServiceImpl}#if(!${kotlin});#end
+
+
+import ${package.Entity}.${entity}#if(!${kotlin});#end
+
+import ${package.Mapper}.${table.mapperName}#if(!${kotlin});#end
+
+import ${package.Service}.${table.serviceName}#if(!${kotlin});#end
+
+import ${superServiceImplClassPackage}#if(!${kotlin});#end
+
+import org.springframework.stereotype.Service#if(!${kotlin});#end
+
+
+/**
+ * <p>
+ * $!{table.comment} 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+@Service
+#if(${kotlin})
+open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} {
+
+}
+#else
+public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} {
+
+}
+#end