From 1353b040a8c1ca0a5a97edbaa238507f06eeacf5 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Fri, 7 Dec 2018 22:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                           |  6 ++
 .../src/main/resources/application.yml        |  2 +-
 .../com/ruoyi/exam/domain/ExamQuestion.java   |  4 +-
 .../exam/domain/ExamQuestionCategory.java     |  4 +-
 .../exam/domain/ExamQuestionComment.java      |  4 +-
 .../ruoyi/exam/domain/ExamQuestionItem.java   |  4 +-
 .../com/ruoyi/system/domain/SysConfig.java    |  3 +
 .../java/com/ruoyi/system/domain/SysDept.java |  3 +
 .../com/ruoyi/system/domain/SysDictData.java  |  3 +
 .../com/ruoyi/system/domain/SysDictType.java  |  3 +
 .../ruoyi/system/domain/SysLogininfor.java    |  3 +
 .../java/com/ruoyi/system/domain/SysMenu.java |  3 +
 .../com/ruoyi/system/domain/SysNotice.java    |  3 +
 .../com/ruoyi/system/domain/SysOperLog.java   |  3 +
 .../java/com/ruoyi/system/domain/SysPost.java |  3 +
 .../java/com/ruoyi/system/domain/SysRole.java |  3 +
 .../com/ruoyi/system/domain/SysRoleDept.java  |  3 +
 .../com/ruoyi/system/domain/SysRoleMenu.java  |  3 +
 .../java/com/ruoyi/system/domain/SysUser.java |  3 +
 .../ruoyi/system/domain/SysUserOnline.java    |  3 +
 .../com/ruoyi/system/domain/SysUserPost.java  |  3 +
 .../com/ruoyi/system/domain/SysUserRole.java  |  3 +
 .../ruoyi/agile/domain/GenTableColumn.java    |  4 +-
 .../ruoyi/agile/mapper/GenTableMapper.java    |  3 -
 .../ruoyi/generator/domain/ColumnInfo.java    |  3 +
 .../com/ruoyi/generator/domain/TableInfo.java |  3 +
 .../service/impl/GenServiceImpl.java          | 85 +++++++++----------
 .../mapper/agile/GenTableColumnMapper.xml     |  2 +-
 .../resources/mapper/agile/GenTableMapper.xml |  2 +-
 .../main/resources/vm/java/Controller.java.vm | 10 +--
 .../src/main/resources/vm/java/Mapper.java.vm | 41 +--------
 .../main/resources/vm/java/Service.java.vm    | 42 ++-------
 .../resources/vm/java/ServiceImpl.java.vm     | 54 ++----------
 .../src/main/resources/vm/java/domain.java.vm |  2 +
 .../src/main/resources/vm/xml/Mapper.xml.vm   | 49 +----------
 35 files changed, 145 insertions(+), 227 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 07aeefb2d..1806321ce 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -51,6 +51,12 @@
             <artifactId>ruoyi-exam</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
+        <!-- 测试生成的代码-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-test</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
         <!-- 定时任务
         <dependency>
             <groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 30fa8184d..214685cd2 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -127,7 +127,7 @@ gen:
   # 作者
   author: zhujj
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.exam
+  packageName: com.ruoyi.test
   # 自动去除表前缀，默认是true
   autoRemovePre: false
   # 表前缀(类名不会包含表前缀)
diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java
index 415743c3d..7036d68d5 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestion.java
@@ -2,7 +2,8 @@ package com.ruoyi.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.base.BaseEntity;
+
+import javax.persistence.Id;
 import java.util.Date;
 
 /**
@@ -16,6 +17,7 @@ public class ExamQuestion
 	private static final long serialVersionUID = 1L;
 	
 	/**  */
+	@Id
 	private String id;
 	/** 问题标题 */
 	private String title;
diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java
index 7469e4159..478c096a4 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionCategory.java
@@ -2,7 +2,8 @@ package com.ruoyi.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.base.BaseEntity;
+
+import javax.persistence.Id;
 import java.util.Date;
 
 /**
@@ -16,6 +17,7 @@ public class ExamQuestionCategory
 	private static final long serialVersionUID = 1L;
 	
 	/**  */
+	@Id
 	private String id;
 	/** 分类 */
 	private String name;
diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java
index 4f642f483..948fa8c43 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionComment.java
@@ -2,7 +2,8 @@ package com.ruoyi.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.base.BaseEntity;
+
+import javax.persistence.Id;
 import java.util.Date;
 
 /**
@@ -16,6 +17,7 @@ public class ExamQuestionComment
 	private static final long serialVersionUID = 1L;
 	
 	/**  */
+	@Id
 	private String id;
 	/** 点评内容 */
 	private Integer content;
diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java
index 0f82253e2..cd4c9a96b 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamQuestionItem.java
@@ -2,7 +2,8 @@ package com.ruoyi.exam.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.base.BaseEntity;
+
+import javax.persistence.Id;
 import java.util.Date;
 
 /**
@@ -16,6 +17,7 @@ public class ExamQuestionItem
 	private static final long serialVersionUID = 1L;
 	
 	/**  */
+	@Id
 	private String id;
 	/** 选项内容 */
 	private String content;
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java
index d1209a0b5..219f8c676 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 参数配置表 sys_config
  * 
@@ -16,6 +18,7 @@ public class SysConfig extends BaseEntity
 
     /** 参数主键 */
     @Excel(name = "参数主键")
+    @Id
     private Long configId;
 
     /** 参数名称 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java
index e3bd54906..899c4232c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDept.java
@@ -4,6 +4,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 部门表 sys_dept
  * 
@@ -14,6 +16,7 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
+    @Id
     private Long deptId;
 
     /** 父部门ID */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java
index dcfd57dc3..800353a5f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictData.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 字典数据表 sys_dict_data
  * 
@@ -16,6 +18,7 @@ public class SysDictData extends BaseEntity
 
     /** 字典编码 */
     @Excel(name = "字典编码")
+    @Id
     private Long dictCode;
 
     /** 字典排序 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java
index f7b04b1f5..3bc964c87 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysDictType.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 字典类型表 sys_dict_type
  * 
@@ -16,6 +18,7 @@ public class SysDictType extends BaseEntity
 
     /** 字典主键 */
     @Excel(name = "字典主键")
+    @Id
     private Long dictId;
 
     /** 字典名称 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
index 2f112516b..870129e11 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@@ -6,6 +6,8 @@ import java.util.Date;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 系统访问记录表 sys_logininfor
  * 
@@ -17,6 +19,7 @@ public class SysLogininfor extends BaseEntity
     
     /** ID */
     @Excel(name = "序号")
+    @Id
     private Long infoId;
     
     /** 用户账号 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java
index 69e9bcf8a..2e88baa5c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysMenu.java
@@ -6,6 +6,8 @@ import java.util.ArrayList;
 import java.util.List;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 菜单权限表 sys_menu
  * 
@@ -16,6 +18,7 @@ public class SysMenu extends BaseEntity
     private static final long serialVersionUID = 1L;
     
     /** 菜单ID */
+    @Id
     private Long menuId;
     
     /** 菜单名称 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java
index d43e88df5..207a32ea0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -4,6 +4,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 通知公告表 sys_notice
  * 
@@ -14,6 +16,7 @@ public class SysNotice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 公告ID */
+    @Id
     private Long noticeId;
     
     /** 公告标题 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java
index 3c32fb3b8..345f9876c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@@ -6,6 +6,8 @@ import java.util.Date;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 操作日志记录表 oper_log
  * 
@@ -17,6 +19,7 @@ public class SysOperLog extends BaseEntity
 
     /** 日志主键 */
     @Excel(name = "操作序号")
+    @Id
     private Long operId;
 
     /** 操作模块 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java
index 8c36405b6..8bb9cab11 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 岗位表 sys_post
  * 
@@ -16,6 +18,7 @@ public class SysPost extends BaseEntity
 
     /** 岗位序号 */
     @Excel(name = "岗位序号")
+    @Id
     private Long postId;
 
     /** 岗位编码 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java
index 1927ed6d8..248cdd423 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRole.java
@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 角色表 sys_role
  * 
@@ -16,6 +18,7 @@ public class SysRole extends BaseEntity
 
     /** 角色ID */
     @Excel(name = "角色序号")
+    @Id
     private Long roleId;
 
     /** 角色名称 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
index 47b21bf79..f2dbe85d9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@@ -3,6 +3,8 @@ package com.ruoyi.system.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.persistence.Id;
+
 /**
  * 角色和部门关联 sys_role_dept
  * 
@@ -11,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysRoleDept
 {
     /** 角色ID */
+    @Id
     private Long roleId;
     
     /** 部门ID */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
index de10a7470..6dadf0681 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@@ -3,6 +3,8 @@ package com.ruoyi.system.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.persistence.Id;
+
 /**
  * 角色和菜单关联 sys_role_menu
  * 
@@ -11,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysRoleMenu
 {
     /** 角色ID */
+    @Id
     private Long roleId;
     
     /** 菜单ID */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java
index 3a6dcd951..ec221e3a9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUser.java
@@ -7,6 +7,8 @@ import java.util.List;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
+
 /**
  * 用户对象 sys_user
  * 
@@ -18,6 +20,7 @@ public class SysUser extends BaseEntity
 
     /** 用户ID */
     @Excel(name = "用户序号")
+    @Id
     private Long userId;
 
     /** 部门ID */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
index 5f01feb21..cb13db4e0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.base.BaseEntity;
 import com.ruoyi.common.enums.OnlineStatus;
 
+import javax.persistence.Id;
+
 /**
  * 当前在线会话 sys_user_online
  * 
@@ -16,6 +18,7 @@ public class SysUserOnline extends BaseEntity
     private static final long serialVersionUID = 1L;
     
     /** 用户会话id */
+    @Id
     private String sessionId;
 
     /** 部门名称 */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java
index 6e8c416f2..b230ba2a1 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@@ -3,6 +3,8 @@ package com.ruoyi.system.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.persistence.Id;
+
 /**
  * 用户和岗位关联 sys_user_post
  * 
@@ -11,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysUserPost
 {
     /** 用户ID */
+    @Id
     private Long userId;
     
     /** 岗位ID */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java
index 4d1581014..c9ab2f7a9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@@ -3,6 +3,8 @@ package com.ruoyi.system.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import javax.persistence.Id;
+
 /**
  * 用户和角色关联 sys_user_role
  * 
@@ -11,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysUserRole
 {
     /** 用户ID */
+    @Id
     private Long userId;
     
     /** 角色ID */
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTableColumn.java
index a7c2c6b1d..7087ac28a 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/domain/GenTableColumn.java
@@ -1,9 +1,10 @@
 package com.ruoyi.agile.domain;
 
+import com.ruoyi.common.base.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.base.BaseEntity;
 
+import javax.persistence.Id;
 import java.math.BigDecimal;
 
 /**
@@ -17,6 +18,7 @@ public class GenTableColumn extends BaseEntity
 	private static final long serialVersionUID = 1L;
 	
 	/** 编号 */
+	@Id
 	private String id;
 	/** 表名 */
 	private String tableName;
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java b/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java
index ae632b41b..7fcf41541 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/agile/mapper/GenTableMapper.java
@@ -2,9 +2,6 @@ package com.ruoyi.agile.mapper;
 
 import com.ruoyi.agile.domain.GenTable;
 import com.ruoyi.framework.web.base.MyMapper;
-import com.ruoyi.generator.domain.TableInfo;
-
-import java.util.List;
 
 /**
  * 代码生成 数据层
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java
index 7afab2675..4b0ea9c08 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/ColumnInfo.java
@@ -3,6 +3,8 @@ package com.ruoyi.generator.domain;
 import com.ruoyi.common.json.JSON;
 import com.ruoyi.common.utils.StringUtils;
 
+import javax.persistence.Id;
+
 /**
  * ry数据库表列信息
  * 
@@ -11,6 +13,7 @@ import com.ruoyi.common.utils.StringUtils;
 public class ColumnInfo
 {
     /** 字段名称 */
+    @Id
     private String columnName;
 
     /** 字段类型 */
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java
index ee8acc0c5..8e3bdd686 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/TableInfo.java
@@ -4,6 +4,8 @@ import java.util.List;
 import com.ruoyi.common.base.BaseEntity;
 import com.ruoyi.common.utils.StringUtils;
 
+import javax.persistence.Id;
+
 /**
  * ry 数据库表
  * 
@@ -14,6 +16,7 @@ public class TableInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 表名称 */
+    @Id
     private String tableName;
 
     /** 表描述 */
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java
index b14c30544..00c6fc7dc 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenServiceImpl.java
@@ -27,112 +27,103 @@ import com.ruoyi.generator.util.VelocityInitializer;
 
 /**
  * 代码生成 服务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class GenServiceImpl extends AbstractBaseServiceImpl<GenMapper,TableInfo> implements IGenService {
-    private static final Logger log = LoggerFactory.getLogger(GenServiceImpl.class);
+public class GenServiceImpl extends AbstractBaseServiceImpl<GenMapper, TableInfo> implements IGenService {
+    private static final Logger log = LoggerFactory.getLogger( GenServiceImpl.class );
 
 
     /**
      * 查询ry数据库表信息
-     * 
+     *
      * @param tableInfo 表信息
      * @return 数据库表列表
      */
     @Override
-    public List<TableInfo> selectTableList(TableInfo tableInfo)
-    {
+    public List<TableInfo> selectTableList(TableInfo tableInfo) {
         startPage();
-        return mapper.selectTableList(tableInfo);
+        return mapper.selectTableList( tableInfo );
     }
 
     /**
      * 生成代码
-     * 
+     *
      * @param tableName 表名称
      * @return 数据
      */
     @Override
-    public byte[] generatorCode(String tableName)
-    {
+    public byte[] generatorCode(String tableName) {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        ZipOutputStream zip = new ZipOutputStream( outputStream );
         // 查询表信息
-        TableInfo table = mapper.selectTableByName(tableName);
+        TableInfo table = mapper.selectTableByName( tableName );
         // 查询列信息
-        List<ColumnInfo> columns = mapper.selectTableColumnsByName(tableName);
+        List<ColumnInfo> columns = mapper.selectTableColumnsByName( tableName );
         // 生成代码
-        generatorCode(table, columns, zip);
-        IOUtils.closeQuietly(zip);
+        generatorCode( table, columns, zip );
+        IOUtils.closeQuietly( zip );
         return outputStream.toByteArray();
     }
 
     /**
      * 批量生成代码
-     * 
+     *
      * @param tableNames 表数组
      * @return 数据
      */
     @Override
-    public byte[] generatorCode(String[] tableNames)
-    {
+    public byte[] generatorCode(String[] tableNames) {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        for (String tableName : tableNames)
-        {
+        ZipOutputStream zip = new ZipOutputStream( outputStream );
+        for (String tableName : tableNames) {
             // 查询表信息
-            TableInfo table = mapper.selectTableByName(tableName);
+            TableInfo table = mapper.selectTableByName( tableName );
             // 查询列信息
-            List<ColumnInfo> columns = mapper.selectTableColumnsByName(tableName);
+            List<ColumnInfo> columns = mapper.selectTableColumnsByName( tableName );
             // 生成代码
-            generatorCode(table, columns, zip);
+            generatorCode( table, columns, zip );
         }
-        IOUtils.closeQuietly(zip);
+        IOUtils.closeQuietly( zip );
         return outputStream.toByteArray();
     }
 
     /**
      * 生成代码
      */
-    public void generatorCode(TableInfo table, List<ColumnInfo> columns, ZipOutputStream zip)
-    {
+    public void generatorCode(TableInfo table, List<ColumnInfo> columns, ZipOutputStream zip) {
         // 表名转换成Java属性名
-        String className = GenUtils.tableToJava(table.getTableName());
-        table.setClassName(className);
-        table.setClassname(StringUtils.uncapitalize(className));
+        String className = GenUtils.tableToJava( table.getTableName() );
+        table.setClassName( className );
+        table.setClassname( StringUtils.uncapitalize( className ) );
         // 列信息
-        table.setColumns(GenUtils.transColums(columns));
+        table.setColumns( GenUtils.transColums( columns ) );
         // 设置主键
-        table.setPrimaryKey(table.getColumnsLast());
+        table.setPrimaryKey( table.getColumnsLast() );
 
         VelocityInitializer.initVelocity();
 
         String packageName = Global.getPackageName();
-        String moduleName = GenUtils.getModuleName(packageName);
+        String moduleName = GenUtils.getModuleName( packageName );
 
-        VelocityContext context = GenUtils.getVelocityContext(table);
+        VelocityContext context = GenUtils.getVelocityContext( table );
 
         // 获取模板列表
         List<String> templates = GenUtils.getTemplates();
-        for (String template : templates)
-        {
+        for (String template : templates) {
             // 渲染模板
             StringWriter sw = new StringWriter();
-            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-            tpl.merge(context, sw);
-            try
-            {
+            Template tpl = Velocity.getTemplate( template, Constants.UTF8 );
+            tpl.merge( context, sw );
+            try {
                 // 添加到zip
-                zip.putNextEntry(new ZipEntry(GenUtils.getFileName(template, table, moduleName)));
-                IOUtils.write(sw.toString(), zip, Constants.UTF8);
-                IOUtils.closeQuietly(sw);
+                zip.putNextEntry( new ZipEntry( GenUtils.getFileName( template, table, moduleName ) ) );
+                IOUtils.write( sw.toString(), zip, Constants.UTF8 );
+                IOUtils.closeQuietly( sw );
                 zip.closeEntry();
-            }
-            catch (IOException e)
-            {
-                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+            } catch (IOException e) {
+                log.error( "渲染模板失败，表名：" + table.getTableName(), e );
             }
         }
     }
diff --git a/ruoyi-generator/src/main/resources/mapper/agile/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/agile/GenTableColumnMapper.xml
index e5c736998..b5afcc341 100644
--- a/ruoyi-generator/src/main/resources/mapper/agile/GenTableColumnMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/agile/GenTableColumnMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.agile.mapper.GenTableColumnMapper">
+<mapper namespace="com.ruoyi.agile.mapper.GenTableColumnAllMapper">
     
     <resultMap type="GenTableColumn" id="GenTableColumnResult">
         <result property="id"    column="id"    />
diff --git a/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml
index 8e7ce3ad1..54f8f6996 100644
--- a/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/agile/GenTableMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.agile.mapper.GenTableMapper">
+<mapper namespace="com.ruoyi.agile.mapper.GenTableAllMapper">
     
     <resultMap type="GenTable" id="GenTableResult">
         <result property="id"    column="id"    />
diff --git a/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm
index 677b4c69d..936c18922 100644
--- a/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm
@@ -49,7 +49,7 @@ public class ${className}Controller extends BaseController
 	@ResponseBody
 	public TableDataInfo list(${className} ${classname})
 	{
-        List<${className}> list = ${classname}Service.select${className}List(${classname});
+        List<${className}> list = ${classname}Service.select${className}Page(${classname});
 		return getDataTable(list);
 	}
 	
@@ -85,7 +85,7 @@ public class ${className}Controller extends BaseController
 	@ResponseBody
 	public AjaxResult addSave(${className} ${classname})
 	{		
-		return toAjax(${classname}Service.insert${className}(${classname}));
+		return toAjax(${classname}Service.insert(${classname}));
 	}
 
 	/**
@@ -94,7 +94,7 @@ public class ${className}Controller extends BaseController
 	@GetMapping("/edit/{${primaryKey.attrname}}")
 	public String edit(@PathVariable("${primaryKey.attrname}") ${primaryKey.attrType} ${primaryKey.attrname}, ModelMap mmap)
 	{
-		${className} ${classname} = ${classname}Service.select${className}ById(${primaryKey.attrname});
+		${className} ${classname} = ${classname}Service.selectById(${primaryKey.attrname});
 		mmap.put("${classname}", ${classname});
 	    return prefix + "/edit";
 	}
@@ -108,7 +108,7 @@ public class ${className}Controller extends BaseController
 	@ResponseBody
 	public AjaxResult editSave(${className} ${classname})
 	{		
-		return toAjax(${classname}Service.update${className}(${classname}));
+		return toAjax(${classname}Service.updateById(${classname}));
 	}
 	
 	/**
@@ -120,7 +120,7 @@ public class ${className}Controller extends BaseController
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{		
-		return toAjax(${classname}Service.delete${className}ByIds(ids));
+		return toAjax(${classname}Service.deleteByIds(ids));
 	}
 	
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm
index 5171405ed..5b1acfc92 100644
--- a/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/Mapper.java.vm
@@ -12,14 +12,7 @@ import com.ruoyi.framework.web.base.MyMapper;
  */
 public interface ${className}Mapper  extends MyMapper<${className}>
 {
-	/**
-     * 查询${tableComment}信息
-     * 
-     * @param ${primaryKey.attrname} ${tableComment}ID
-     * @return ${tableComment}信息
-     */
-	public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
-	
+
 	/**
      * 查询${tableComment}列表
      * 
@@ -28,36 +21,4 @@ public interface ${className}Mapper  extends MyMapper<${className}>
      */
 	public List<${className}> select${className}List(${className} ${classname});
 	
-	/**
-     * 新增${tableComment}
-     * 
-     * @param ${classname} ${tableComment}信息
-     * @return 结果
-     */
-	public int insert${className}(${className} ${classname});
-	
-	/**
-     * 修改${tableComment}
-     * 
-     * @param ${classname} ${tableComment}信息
-     * @return 结果
-     */
-	public int update${className}(${className} ${classname});
-	
-	/**
-     * 删除${tableComment}
-     * 
-     * @param ${primaryKey.attrname} ${tableComment}ID
-     * @return 结果
-     */
-	public int delete${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
-	
-	/**
-     * 批量删除${tableComment}
-     * 
-     * @param ${primaryKey.attrname}s 需要删除的数据ID
-     * @return 结果
-     */
-	public int delete${className}ByIds(String[] ${primaryKey.attrname}s);
-	
 }
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/java/Service.java.vm b/ruoyi-generator/src/main/resources/vm/java/Service.java.vm
index cee3d6f60..01159ae0e 100644
--- a/ruoyi-generator/src/main/resources/vm/java/Service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/Service.java.vm
@@ -12,43 +12,19 @@ import com.ruoyi.framework.web.base.AbstractBaseService;
 public interface I${className}Service extends AbstractBaseService<${className}>
 {
 	/**
-     * 查询${tableComment}信息
-     * 
-     * @param ${primaryKey.attrname} ${tableComment}ID
-     * @return ${tableComment}信息
-     */
-	public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname});
-	
-	/**
-     * 查询${tableComment}列表
-     * 
+     * 查询${tableComment}分页列表
+     *
      * @param ${classname} ${tableComment}信息
      * @return ${tableComment}集合
      */
-	public List<${className}> select${className}List(${className} ${classname});
-	
-	/**
-     * 新增${tableComment}
-     * 
+	public List<${className}> select${className}Page(${className} ${classname});
+    /**
+     * 查询${tableComment}列表
+     *
      * @param ${classname} ${tableComment}信息
-     * @return 结果
+     * @return ${tableComment}集合
      */
-	public int insert${className}(${className} ${classname});
-	
-	/**
-     * 修改${tableComment}
-     * 
-     * @param ${classname} ${tableComment}信息
-     * @return 结果
-     */
-	public int update${className}(${className} ${classname});
-		
-	/**
-     * 删除${tableComment}信息
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-	public int delete${className}ByIds(String ids);
+    public List<${className}> select${className}List(${className} ${classname});
+
 	
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
index 810c54e78..79d095560 100644
--- a/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/ServiceImpl.java.vm
@@ -20,17 +20,6 @@ public class ${className}ServiceImpl extends AbstractBaseServiceImpl<${className
 	@Autowired
 	private ${className}Mapper ${classname}Mapper;
 
-	/**
-     * 查询${tableComment}信息
-     * 
-     * @param ${primaryKey.attrname} ${tableComment}ID
-     * @return ${tableComment}信息
-     */
-    @Override
-	public ${className} select${className}ById(${primaryKey.attrType} ${primaryKey.attrname})
-	{
-	    return ${classname}Mapper.select${className}ById(${primaryKey.attrname});
-	}
 	
 	/**
      * 查询${tableComment}列表
@@ -41,44 +30,19 @@ public class ${className}ServiceImpl extends AbstractBaseServiceImpl<${className
 	@Override
 	public List<${className}> select${className}List(${className} ${classname})
 	{
-	    startPage();
         return ${classname}Mapper.select${className}List(${classname});
 	}
-	
     /**
-     * 新增${tableComment}
-     * 
+     * 查询${tableComment}分页列表
+     *
      * @param ${classname} ${tableComment}信息
-     * @return 结果
+     * @return ${tableComment}集合
      */
-	@Override
-	public int insert${className}(${className} ${classname})
-	{
-	    return ${classname}Mapper.insert${className}(${classname});
-	}
-	
-	/**
-     * 修改${tableComment}
-     * 
-     * @param ${classname} ${tableComment}信息
-     * @return 结果
-     */
-	@Override
-	public int update${className}(${className} ${classname})
-	{
-	    return ${classname}Mapper.update${className}(${classname});
-	}
+    @Override
+    public List<${className}> select${className}Page(${className} ${classname})
+    {
+        startPage();
+        return ${classname}Mapper.select${className}List(${classname});
+    }
 
-	/**
-     * 删除${tableComment}对象
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-	@Override
-	public int delete${className}ByIds(String ids)
-	{
-		return ${classname}Mapper.delete${className}ByIds(Convert.toStrArray(ids));
-	}
-	
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 19f760ab1..7f6bacac6 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.base.BaseEntity;
 #foreach ($column in $columns)
 #if($column.attrType == 'Date')
+import javax.persistence.Id;
 import java.util.Date;
 #break
 #end
@@ -22,6 +23,7 @@ public class ${className}
 	
 #foreach ($column in $columns)
 	/** $column.columnComment */
+	@Id
 	private $column.attrType $column.attrname;
 #end
 
diff --git a/ruoyi-generator/src/main/resources/vm/xml/Mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/Mapper.xml.vm
index c87911e43..28b58a4a9 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/Mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/Mapper.xml.vm
@@ -11,62 +11,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="select${className}Vo">
-        select#foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end from ${tableName}
+        #foreach($column in $columns) $column.columnName#if($velocityCount != $columns.size()),#end#end
     </sql>
 	
     <select id="select${className}List" parameterType="${className}" resultMap="${className}Result">
+        select
         <include refid="select${className}Vo"/>
+        from ${tableName}
         <where>  
 #foreach($column in $columns)
             <if test="$column.attrname != null #if($column.attrType == 'String' ) and $column.attrname.trim() != '' #end"> and $column.columnName = #{$column.attrname}</if>
  #end
         </where>
     </select>
-    
-    <select id="select${className}ById" parameterType="${primaryKey.attrType}" resultMap="${className}Result">
-        <include refid="select${className}Vo"/>
-        where ${primaryKey.columnName} = #{${primaryKey.attrname}}
-    </select>
-        
-    <insert id="insert${className}" parameterType="${className}"#if($primaryKey.extra == 'auto_increment') useGeneratedKeys="true" keyProperty="$primaryKey.attrname"#end>
-        insert into ${tableName}
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment')
-			<if test="$column.attrname != null #if($column.attrType == 'String' ) and $column.attrname != '' #end ">$column.columnName,</if>
-#end
-#end
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $primaryKey.columnName || $primaryKey.extra != 'auto_increment')
-			<if test="$column.attrname != null #if($column.attrType == 'String' ) and $column.attrname != '' #end ">#{$column.attrname},</if>
-#end			
-#end
-         </trim>
-    </insert>
-	 
-    <update id="update${className}" parameterType="${className}">
-        update ${tableName}
-        <trim prefix="SET" suffixOverrides=",">
-#foreach($column in $columns)
-#if($column.columnName != $primaryKey.columnName)
-            <if test="$column.attrname != null #if($column.attrType == 'String' ) and $column.attrname != '' #end ">$column.columnName = #{$column.attrname},</if>
-#end
-#end
-        </trim>
-        where ${primaryKey.columnName} = #{${primaryKey.attrname}}
-    </update>
 
-	<delete id="delete${className}ById" parameterType="${primaryKey.attrType}">
-        delete from ${tableName} where ${primaryKey.columnName} = #{${primaryKey.attrname}}
-    </delete>
-	
-    <delete id="delete${className}ByIds" parameterType="String">
-        delete from ${tableName} where ${primaryKey.columnName} in 
-        <foreach item="${primaryKey.attrname}" collection="array" open="(" separator="," close=")">
-            #{${primaryKey.attrname}}
-        </foreach>
-    </delete>
     
 </mapper>
\ No newline at end of file