修改代码生成

game-admin/pom.xml

@@ -34,7 +34,12 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-models</artifactId>
-            <version>1.6.2</version>
+            <version>${swagger.core.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger.core.version}</version>
         </dependency>
 
          <!-- Mysql驱动包 -->

game-common/pom.xml

@@ -41,6 +41,11 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
         <!-- pagehelper 分页插件 -->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -53,6 +58,12 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+
         <!--常用工具类 -->
         <dependency>
             <groupId>org.apache.commons</groupId>

game-generator/src/main/resources/vm/java/domain.java.vm

@@ -8,11 +8,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.sis.common.annotation.Excel;
+import com.game.common.annotation.Excel;
+import com.game.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModel;
+import lombok.Data;
 #if($table.crud || $table.sub)
-import com.rchuing.sis.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.fenghuang.common.core.domain.TreeEntity;
 #end
@@ -29,6 +30,7 @@ import com.fenghuang.common.core.domain.TreeEntity;
     #set($Entity="TreeEntity")
 #end
 @TableName(resultMap = "${packageName}.mapper.${ClassName}Mapper.${ClassName}Result")
+@Data
 public class ${ClassName} extends ${Entity}
         {
 private static final long serialVersionUID = 1L;
@@ -60,56 +62,8 @@ private static final long serialVersionUID = 1L;
 
     #end
 #end
-#if($table.sub)
-/** $table.subTable.functionName信息 */
-private List<${subClassName}> ${subclassName}List;
-
-#end
-#foreach ($column in $columns)
-    #if(!$table.isSuperColumn($column.javaField))
-        #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-            #set($AttrName=$column.javaField)
-        #else
-            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-        #end
-    public void set${AttrName}($column.javaType $column.javaField)
-            {
-            this.$column.javaField = $column.javaField;
-            }
-
-    public $column.javaType get${AttrName}()
-            {
-            return $column.javaField;
-            }
-    #end
-#end
-
-#if($table.sub)
-public List<${subClassName}> get${subClassName}List()
-        {
-        return ${subclassName}List;
-        }
-
-public void set${subClassName}List(List<${subClassName}> ${subclassName}List)
-        {
-        this.${subclassName}List = ${subclassName}List;
-        }
-
-#end
-@Override
-public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-    #foreach ($column in $columns)
-        #if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-            #set($AttrName=$column.javaField)
-        #else
-            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-        #end
-            .append("${column.javaField}", get${AttrName}())
-    #end
     #if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-    #end
-        .toString();
-        }
-        }
+    /** $table.subTable.functionName信息 */
+    private List<${subClassName}> ${subclassName}List;
+
+    #end

game-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
     #foreach ($column in $columns)
         #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
-        import com.rchuing.common.utils.DateUtils;
+        import com.game.common.utils.DateUtils;
             #break
         #end
     #end
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
     #if($table.sub)
     import java.util.ArrayList;
-    import com.rchuing.common.utils.StringUtils;
+    import com.game.common.utils.StringUtils;
     import org.springframework.transaction.annotation.Transactional;
     import ${packageName}.domain.${subClassName};
     #end

game-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -5,8 +5,8 @@ package ${packageName}.domain;
     #end
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.common.annotation.Excel;
-import com.rchuing.common.core.domain.BaseEntity;
+import com.game.common.annotation.Excel;
+import com.game.common.core.domain.BaseEntity;
 
 /**
  * ${subTable.functionName}对象 ${subTableName}

game-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -4,14 +4,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
     
-    <resultMap type="${ClassName}" id="${ClassName}Result">
+    <resultMap type="${packageName}.domain.${ClassName}" id="${ClassName}Result">
 #foreach ($column in $columns)
         <result property="${column.javaField}"    column="${column.columnName}"    />
 #end
     </resultMap>
 #if($table.sub)
 
-    <resultMap id="${ClassName}${subClassName}Result" type="${ClassName}" extends="${ClassName}Result">
+    <resultMap id="${ClassName}${subClassName}Result" type="${packageName}.domain.${ClassName}" extends="${ClassName}Result">
         <collection property="${subclassName}List" notNullColumn="sub_${subTable.pkColumn.columnName}" javaType="java.util.List" resultMap="${subClassName}Result" />
     </resultMap>
 
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName}
     </sql>
 
-    <select id="select${ClassName}List" parameterType="${ClassName}" resultMap="${ClassName}Result">
+    <select id="select${ClassName}List" parameterType="${packageName}.domain.${ClassName}" resultMap="${ClassName}Result">
         <include refid="select${ClassName}Vo"/>
         <where>  
 #foreach($column in $columns)
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 #end
     </select>
         
-    <insert id="insert${ClassName}" parameterType="${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
+    <insert id="insert${ClassName}" parameterType="${packageName}.domain.${ClassName}"#if($pkColumn.increment) useGeneratedKeys="true" keyProperty="$pkColumn.javaField"#end>
         insert into ${tableName}
         <trim prefix="(" suffix=")" suffixOverrides=",">
 #foreach($column in $columns)
@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-    <update id="update${ClassName}" parameterType="${ClassName}">
+    <update id="update${ClassName}" parameterType="${packageName}.domain.${ClassName}">
         update ${tableName}
         <trim prefix="SET" suffixOverrides=",">
 #foreach($column in $columns)

pom.xml

@@ -31,6 +31,8 @@
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
+        <lombok.version>1.16.20</lombok.version>
+        <swagger.core.version>1.6.2</swagger.core.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -150,6 +152,13 @@
                 </exclusions>
             </dependency>
 
+            <!-- lombok -->
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.game</groupId>