更新数据模型

project-datamodel/zheng.sql

@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50621
 File Encoding         : 65001
 
-Date: 2017-01-20 23:33:25
+Date: 2017-02-06 21:09:06
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -399,74 +399,16 @@ CREATE TABLE `pay_vest` (
 -- Records of pay_vest
 -- ----------------------------
 
--- ----------------------------
--- Table structure for tmp_upms_organization
--- ----------------------------
-DROP TABLE IF EXISTS `tmp_upms_organization`;
-CREATE TABLE `tmp_upms_organization` (
-  `organization_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `system_id` int(10) unsigned NOT NULL,
-  `name` varchar(20) DEFAULT NULL,
-  `description` varchar(1000) DEFAULT NULL,
-  PRIMARY KEY (`organization_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组织';
-
--- ----------------------------
--- Records of tmp_upms_organization
--- ----------------------------
-
--- ----------------------------
--- Table structure for tmp_upms_permission
--- ----------------------------
-DROP TABLE IF EXISTS `tmp_upms_permission`;
-CREATE TABLE `tmp_upms_permission` (
-  `permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `system_id` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`permission_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='权限';
-
--- ----------------------------
--- Records of tmp_upms_permission
--- ----------------------------
-INSERT INTO `tmp_upms_permission` VALUES ('1', '1');
-
--- ----------------------------
--- Table structure for tmp_upms_user
--- ----------------------------
-DROP TABLE IF EXISTS `tmp_upms_user`;
-CREATE TABLE `tmp_upms_user` (
-  `user_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `system_id` int(10) unsigned NOT NULL,
-  `username` varchar(20) NOT NULL,
-  `password` varchar(32) NOT NULL,
-  `salt` varchar(32) DEFAULT NULL,
-  `realname` varchar(20) DEFAULT NULL,
-  `avatar` varchar(50) DEFAULT NULL,
-  `phone` varchar(20) DEFAULT NULL,
-  `email` varchar(50) DEFAULT NULL,
-  `sex` tinyint(4) DEFAULT NULL,
-  `ctime` bigint(20) DEFAULT NULL,
-  PRIMARY KEY (`user_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='用户';
-
--- ----------------------------
--- Records of tmp_upms_user
--- ----------------------------
-INSERT INTO `tmp_upms_user` VALUES ('1', '1', 'admin', 'C1F3459C3869B0D28DA59A966D33810E', '2e1dba52a94d4c30ba27999d823c82ac', '管理员', null, null, null, '1', '1');
-
 -- ----------------------------
 -- Table structure for upms_organization
 -- ----------------------------
 DROP TABLE IF EXISTS `upms_organization`;
 CREATE TABLE `upms_organization` (
   `organization_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `system_id` int(10) unsigned NOT NULL COMMENT '所属系统',
   `name` varchar(20) DEFAULT NULL COMMENT '组织名称',
   `description` varchar(1000) DEFAULT NULL COMMENT '组织描述',
   `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
-  PRIMARY KEY (`organization_id`),
-  KEY `FK_Reference_15` (`system_id`),
-  CONSTRAINT `FK_Reference_15` FOREIGN KEY (`system_id`) REFERENCES `upms_system` (`system_id`)
+  PRIMARY KEY (`organization_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组织';
 
 -- ----------------------------
@@ -480,14 +422,18 @@ DROP TABLE IF EXISTS `upms_permission`;
 CREATE TABLE `upms_permission` (
   `permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
   `system_id` int(10) unsigned NOT NULL COMMENT '所属系统',
+  `pid` int(10) DEFAULT NULL COMMENT '所属上级',
+  `type` tinyint(4) DEFAULT NULL COMMENT '类型(1:菜单,2:按钮)',
   `permission_value` varchar(20) DEFAULT NULL COMMENT '权限值',
+  `icon` varchar(20) DEFAULT NULL COMMENT '图标',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  `orders` bigint(20) DEFAULT NULL COMMENT '排序',
   PRIMARY KEY (`permission_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='权限';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限';
 
 -- ----------------------------
 -- Records of upms_permission
 -- ----------------------------
-INSERT INTO `upms_permission` VALUES ('1', '1', '*:*:*');
 
 -- ----------------------------
 -- Table structure for upms_role
@@ -495,19 +441,16 @@ INSERT INTO `upms_permission` VALUES ('1', '1', '*:*:*');
 DROP TABLE IF EXISTS `upms_role`;
 CREATE TABLE `upms_role` (
   `role_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `system_id` int(10) unsigned NOT NULL,
   `name` varchar(20) DEFAULT NULL,
   `description` varchar(1000) DEFAULT NULL,
-  `status` tinyint(4) NOT NULL,
   `ctime` bigint(20) NOT NULL,
   `orders` bigint(20) NOT NULL,
   PRIMARY KEY (`role_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='角色';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色';
 
 -- ----------------------------
 -- Records of upms_role
 -- ----------------------------
-INSERT INTO `upms_role` VALUES ('1', '1', '超级管理员', '拥有系统所有权限', '1', '1', '1');
 
 -- ----------------------------
 -- Table structure for upms_role_permission
@@ -517,9 +460,7 @@ CREATE TABLE `upms_role_permission` (
   `role_permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `role_id` int(10) unsigned NOT NULL,
   `permission_id` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`role_permission_id`),
-  KEY `FK_Reference_22` (`permission_id`),
-  CONSTRAINT `FK_Reference_22` FOREIGN KEY (`permission_id`) REFERENCES `upms_permission` (`permission_id`)
+  PRIMARY KEY (`role_permission_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色权限关联表';
 
 -- ----------------------------
@@ -531,23 +472,23 @@ CREATE TABLE `upms_role_permission` (
 -- ----------------------------
 DROP TABLE IF EXISTS `upms_system`;
 CREATE TABLE `upms_system` (
-  `system_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `icon` varchar(20) DEFAULT NULL,
-  `basepath` varchar(100) DEFAULT NULL,
-  `status` smallint(6) DEFAULT NULL,
-  `name` varchar(20) DEFAULT NULL,
-  `ctime` bigint(20) DEFAULT NULL,
-  `orders` bigint(20) DEFAULT NULL,
+  `system_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
+  `icon` varchar(20) DEFAULT NULL COMMENT '图标',
+  `basepath` varchar(100) DEFAULT NULL COMMENT '根目录',
+  `status` tinyint(4) DEFAULT NULL COMMENT '状态(-1:黑名单,1:正常)',
+  `name` varchar(20) DEFAULT NULL COMMENT '系统名称',
+  `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
+  `orders` bigint(20) DEFAULT NULL COMMENT '排序',
   PRIMARY KEY (`system_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='系统';
 
 -- ----------------------------
 -- Records of upms_system
 -- ----------------------------
-INSERT INTO `upms_system` VALUES ('1', null, 'http://upms.zhangshuzheng.cn:1113', '1', 'zheng-upms-app1', '1', '1');
-INSERT INTO `upms_system` VALUES ('2', null, 'http://upms.zhangshuzheng.cn:1114', '1', 'zheng-upms-app2', '2', '2');
-INSERT INTO `upms_system` VALUES ('3', null, 'http://cms.zhangshuzheng.cn:2222', '1', 'zheng-cms-admin', '3', '3');
-INSERT INTO `upms_system` VALUES ('4', null, 'http://upms.zhangshuzheng.cn:1111', '1', 'zheng-upms-server', '4', '4');
+INSERT INTO `upms_system` VALUES ('1', '', 'http://upms.zhangshuzheng.cn:1113', '1', 'zheng-upms-app1', '1', '1');
+INSERT INTO `upms_system` VALUES ('2', '', 'http://upms.zhangshuzheng.cn:1114', '1', 'zheng-upms-app2', '2', '2');
+INSERT INTO `upms_system` VALUES ('3', '', 'http://cms.zhangshuzheng.cn:2222', '1', 'zheng-cms-admin', '3', '3');
+INSERT INTO `upms_system` VALUES ('4', '', 'http://upms.zhangshuzheng.cn:1111', '1', 'zheng-upms-server', '4', '4');
 
 -- ----------------------------
 -- Table structure for upms_user
@@ -555,7 +496,6 @@ INSERT INTO `upms_system` VALUES ('4', null, 'http://upms.zhangshuzheng.cn:1111'
 DROP TABLE IF EXISTS `upms_user`;
 CREATE TABLE `upms_user` (
   `user_id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '编号',
-  `system_id` int(10) unsigned NOT NULL COMMENT '所属系统',
   `username` varchar(20) NOT NULL COMMENT '帐号',
   `password` varchar(32) NOT NULL COMMENT '密码MD5(密码+盐)',
   `salt` varchar(32) DEFAULT NULL COMMENT '盐',
@@ -564,15 +504,15 @@ CREATE TABLE `upms_user` (
   `phone` varchar(20) DEFAULT NULL COMMENT '电话',
   `email` varchar(50) DEFAULT NULL COMMENT '邮箱',
   `sex` tinyint(4) DEFAULT NULL COMMENT '性别',
-  `status` tinyint(4) DEFAULT NULL COMMENT '状态(-1:封,0:未审核,1:正常)',
+  `locked` tinyint(4) DEFAULT NULL COMMENT '状态(0:正常,1:锁定)',
   `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
   PRIMARY KEY (`user_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='用户';
 
 -- ----------------------------
 -- Records of upms_user
 -- ----------------------------
-INSERT INTO `upms_user` VALUES ('1', '1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '管理员', null, null, null, null, '1', '1');
+INSERT INTO `upms_user` VALUES ('1', 'admin', '3038D9CB63B3152A79B8153FB06C02F7', '66f1b370c660445a8657bf8bf1794486', '管理员', null, null, null, null, '0', '1');
 
 -- ----------------------------
 -- Table structure for upms_user_organization
@@ -582,9 +522,7 @@ CREATE TABLE `upms_user_organization` (
   `user_organization_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
   `organization_id` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`user_organization_id`),
-  KEY `FK_Reference_19` (`organization_id`),
-  CONSTRAINT `FK_Reference_19` FOREIGN KEY (`organization_id`) REFERENCES `upms_organization` (`organization_id`)
+  PRIMARY KEY (`user_organization_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户组织关联表';
 
 -- ----------------------------
@@ -599,9 +537,7 @@ CREATE TABLE `upms_user_permission` (
   `user_permission_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
   `permission_id` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`user_permission_id`),
-  KEY `FK_Reference_25` (`permission_id`),
-  CONSTRAINT `FK_Reference_25` FOREIGN KEY (`permission_id`) REFERENCES `upms_permission` (`permission_id`)
+  PRIMARY KEY (`user_permission_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户权限关联表';
 
 -- ----------------------------
@@ -616,7 +552,6 @@ CREATE TABLE `upms_user_role` (
   `user_role_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
   `role_id` int(10) DEFAULT NULL,
-  `role` int(10) unsigned NOT NULL,
   PRIMARY KEY (`user_role_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户角色关联表';
 

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.zheng.upms.dao.mapper.UpmsOrganizationMapper">
   <resultMap id="BaseResultMap" type="com.zheng.upms.dao.model.UpmsOrganization">
     <id column="organization_id" jdbcType="INTEGER" property="organizationId" />
-    <result column="system_id" jdbcType="INTEGER" property="systemId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
@@ -67,7 +66,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    organization_id, system_id, name, description, ctime
+    organization_id, name, description, ctime
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsOrganizationExample" resultMap="BaseResultMap">
     select
@@ -108,10 +107,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsOrganization">
-    insert into upms_organization (organization_id, system_id, name, 
-      description, ctime)
-    values (#{organizationId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT})
+    insert into upms_organization (organization_id, name, description, 
+      ctime)
+    values (#{organizationId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
+      #{ctime,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsOrganization">
     insert into upms_organization
@@ -119,9 +118,6 @@
       <if test="organizationId != null">
         organization_id,
       </if>
-      <if test="systemId != null">
-        system_id,
-      </if>
       <if test="name != null">
         name,
       </if>
@@ -136,9 +132,6 @@
       <if test="organizationId != null">
         #{organizationId,jdbcType=INTEGER},
       </if>
-      <if test="systemId != null">
-        #{systemId,jdbcType=INTEGER},
-      </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
@@ -162,9 +155,6 @@
       <if test="record.organizationId != null">
         organization_id = #{record.organizationId,jdbcType=INTEGER},
       </if>
-      <if test="record.systemId != null">
-        system_id = #{record.systemId,jdbcType=INTEGER},
-      </if>
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
@@ -182,7 +172,6 @@
   <update id="updateByExample" parameterType="map">
     update upms_organization
     set organization_id = #{record.organizationId,jdbcType=INTEGER},
-      system_id = #{record.systemId,jdbcType=INTEGER},
       name = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
       ctime = #{record.ctime,jdbcType=BIGINT}
@@ -193,9 +182,6 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.zheng.upms.dao.model.UpmsOrganization">
     update upms_organization
     <set>
-      <if test="systemId != null">
-        system_id = #{systemId,jdbcType=INTEGER},
-      </if>
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
@@ -210,8 +196,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.upms.dao.model.UpmsOrganization">
     update upms_organization
-    set system_id = #{systemId,jdbcType=INTEGER},
-      name = #{name,jdbcType=VARCHAR},
+    set name = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
       ctime = #{ctime,jdbcType=BIGINT}
     where organization_id = #{organizationId,jdbcType=INTEGER}

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml

@@ -4,7 +4,12 @@
   <resultMap id="BaseResultMap" type="com.zheng.upms.dao.model.UpmsPermission">
     <id column="permission_id" jdbcType="INTEGER" property="permissionId" />
     <result column="system_id" jdbcType="INTEGER" property="systemId" />
+    <result column="pid" jdbcType="INTEGER" property="pid" />
+    <result column="type" jdbcType="TINYINT" property="type" />
     <result column="permission_value" jdbcType="VARCHAR" property="permissionValue" />
+    <result column="icon" jdbcType="VARCHAR" property="icon" />
+    <result column="ctime" jdbcType="BIGINT" property="ctime" />
+    <result column="orders" jdbcType="BIGINT" property="orders" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -65,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    permission_id, system_id, permission_value
+    permission_id, system_id, pid, type, permission_value, icon, ctime, orders
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsPermissionExample" resultMap="BaseResultMap">
     select
@@ -106,10 +111,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsPermission">
-    insert into upms_permission (permission_id, system_id, permission_value
-      )
-    values (#{permissionId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{permissionValue,jdbcType=VARCHAR}
-      )
+    insert into upms_permission (permission_id, system_id, pid, 
+      type, permission_value, icon, 
+      ctime, orders)
+    values (#{permissionId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, 
+      #{type,jdbcType=TINYINT}, #{permissionValue,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, 
+      #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsPermission">
     insert into upms_permission
@@ -120,9 +127,24 @@
       <if test="systemId != null">
         system_id,
       </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
       <if test="permissionValue != null">
         permission_value,
       </if>
+      <if test="icon != null">
+        icon,
+      </if>
+      <if test="ctime != null">
+        ctime,
+      </if>
+      <if test="orders != null">
+        orders,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="permissionId != null">
@@ -131,9 +153,24 @@
       <if test="systemId != null">
         #{systemId,jdbcType=INTEGER},
       </if>
+      <if test="pid != null">
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
       <if test="permissionValue != null">
         #{permissionValue,jdbcType=VARCHAR},
       </if>
+      <if test="icon != null">
+        #{icon,jdbcType=VARCHAR},
+      </if>
+      <if test="ctime != null">
+        #{ctime,jdbcType=BIGINT},
+      </if>
+      <if test="orders != null">
+        #{orders,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.zheng.upms.dao.model.UpmsPermissionExample" resultType="java.lang.Long">
@@ -151,9 +188,24 @@
       <if test="record.systemId != null">
         system_id = #{record.systemId,jdbcType=INTEGER},
       </if>
+      <if test="record.pid != null">
+        pid = #{record.pid,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
       <if test="record.permissionValue != null">
         permission_value = #{record.permissionValue,jdbcType=VARCHAR},
       </if>
+      <if test="record.icon != null">
+        icon = #{record.icon,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ctime != null">
+        ctime = #{record.ctime,jdbcType=BIGINT},
+      </if>
+      <if test="record.orders != null">
+        orders = #{record.orders,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -163,7 +215,12 @@
     update upms_permission
     set permission_id = #{record.permissionId,jdbcType=INTEGER},
       system_id = #{record.systemId,jdbcType=INTEGER},
-      permission_value = #{record.permissionValue,jdbcType=VARCHAR}
+      pid = #{record.pid,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=TINYINT},
+      permission_value = #{record.permissionValue,jdbcType=VARCHAR},
+      icon = #{record.icon,jdbcType=VARCHAR},
+      ctime = #{record.ctime,jdbcType=BIGINT},
+      orders = #{record.orders,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -174,16 +231,36 @@
       <if test="systemId != null">
         system_id = #{systemId,jdbcType=INTEGER},
       </if>
+      <if test="pid != null">
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
       <if test="permissionValue != null">
         permission_value = #{permissionValue,jdbcType=VARCHAR},
       </if>
+      <if test="icon != null">
+        icon = #{icon,jdbcType=VARCHAR},
+      </if>
+      <if test="ctime != null">
+        ctime = #{ctime,jdbcType=BIGINT},
+      </if>
+      <if test="orders != null">
+        orders = #{orders,jdbcType=BIGINT},
+      </if>
     </set>
     where permission_id = #{permissionId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.upms.dao.model.UpmsPermission">
     update upms_permission
     set system_id = #{systemId,jdbcType=INTEGER},
-      permission_value = #{permissionValue,jdbcType=VARCHAR}
+      pid = #{pid,jdbcType=INTEGER},
+      type = #{type,jdbcType=TINYINT},
+      permission_value = #{permissionValue,jdbcType=VARCHAR},
+      icon = #{icon,jdbcType=VARCHAR},
+      ctime = #{ctime,jdbcType=BIGINT},
+      orders = #{orders,jdbcType=BIGINT}
     where permission_id = #{permissionId,jdbcType=INTEGER}
   </update>
   <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml

@@ -3,10 +3,8 @@
 <mapper namespace="com.zheng.upms.dao.mapper.UpmsRoleMapper">
   <resultMap id="BaseResultMap" type="com.zheng.upms.dao.model.UpmsRole">
     <id column="role_id" jdbcType="INTEGER" property="roleId" />
-    <result column="system_id" jdbcType="INTEGER" property="systemId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="status" jdbcType="TINYINT" property="status" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
     <result column="orders" jdbcType="BIGINT" property="orders" />
   </resultMap>
@@ -69,7 +67,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    role_id, system_id, name, description, status, ctime, orders
+    role_id, name, description, ctime, orders
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsRoleExample" resultMap="BaseResultMap">
     select
@@ -110,12 +108,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsRole">
-    insert into upms_role (role_id, system_id, name, 
-      description, status, ctime, 
-      orders)
-    values (#{roleId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT}, 
-      #{orders,jdbcType=BIGINT})
+    insert into upms_role (role_id, name, description, 
+      ctime, orders)
+    values (#{roleId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
+      #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsRole">
     insert into upms_role
@@ -123,18 +119,12 @@
       <if test="roleId != null">
         role_id,
       </if>
-      <if test="systemId != null">
-        system_id,
-      </if>
       <if test="name != null">
         name,
       </if>
       <if test="description != null">
         description,
       </if>
-      <if test="status != null">
-        status,
-      </if>
       <if test="ctime != null">
         ctime,
       </if>
@@ -146,18 +136,12 @@
       <if test="roleId != null">
         #{roleId,jdbcType=INTEGER},
       </if>
-      <if test="systemId != null">
-        #{systemId,jdbcType=INTEGER},
-      </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=TINYINT},
-      </if>
       <if test="ctime != null">
         #{ctime,jdbcType=BIGINT},
       </if>
@@ -178,18 +162,12 @@
       <if test="record.roleId != null">
         role_id = #{record.roleId,jdbcType=INTEGER},
       </if>
-      <if test="record.systemId != null">
-        system_id = #{record.systemId,jdbcType=INTEGER},
-      </if>
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=TINYINT},
-      </if>
       <if test="record.ctime != null">
         ctime = #{record.ctime,jdbcType=BIGINT},
       </if>
@@ -204,10 +182,8 @@
   <update id="updateByExample" parameterType="map">
     update upms_role
     set role_id = #{record.roleId,jdbcType=INTEGER},
-      system_id = #{record.systemId,jdbcType=INTEGER},
       name = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=TINYINT},
       ctime = #{record.ctime,jdbcType=BIGINT},
       orders = #{record.orders,jdbcType=BIGINT}
     <if test="_parameter != null">
@@ -217,18 +193,12 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.zheng.upms.dao.model.UpmsRole">
     update upms_role
     <set>
-      <if test="systemId != null">
-        system_id = #{systemId,jdbcType=INTEGER},
-      </if>
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=TINYINT},
-      </if>
       <if test="ctime != null">
         ctime = #{ctime,jdbcType=BIGINT},
       </if>
@@ -240,10 +210,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.upms.dao.model.UpmsRole">
     update upms_role
-    set system_id = #{systemId,jdbcType=INTEGER},
-      name = #{name,jdbcType=VARCHAR},
+    set name = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      status = #{status,jdbcType=TINYINT},
       ctime = #{ctime,jdbcType=BIGINT},
       orders = #{orders,jdbcType=BIGINT}
     where role_id = #{roleId,jdbcType=INTEGER}

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml

@@ -5,7 +5,7 @@
     <id column="system_id" jdbcType="INTEGER" property="systemId" />
     <result column="icon" jdbcType="VARCHAR" property="icon" />
     <result column="basepath" jdbcType="VARCHAR" property="basepath" />
-    <result column="status" jdbcType="SMALLINT" property="status" />
+    <result column="status" jdbcType="TINYINT" property="status" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
     <result column="orders" jdbcType="BIGINT" property="orders" />
@@ -114,7 +114,7 @@
       status, name, ctime, 
       orders)
     values (#{systemId,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, #{basepath,jdbcType=VARCHAR}, 
-      #{status,jdbcType=SMALLINT}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
+      #{status,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
       #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsSystem">
@@ -153,7 +153,7 @@
         #{basepath,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        #{status,jdbcType=SMALLINT},
+        #{status,jdbcType=TINYINT},
       </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
@@ -185,7 +185,7 @@
         basepath = #{record.basepath,jdbcType=VARCHAR},
       </if>
       <if test="record.status != null">
-        status = #{record.status,jdbcType=SMALLINT},
+        status = #{record.status,jdbcType=TINYINT},
       </if>
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
@@ -206,7 +206,7 @@
     set system_id = #{record.systemId,jdbcType=INTEGER},
       icon = #{record.icon,jdbcType=VARCHAR},
       basepath = #{record.basepath,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=SMALLINT},
+      status = #{record.status,jdbcType=TINYINT},
       name = #{record.name,jdbcType=VARCHAR},
       ctime = #{record.ctime,jdbcType=BIGINT},
       orders = #{record.orders,jdbcType=BIGINT}
@@ -224,7 +224,7 @@
         basepath = #{basepath,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=SMALLINT},
+        status = #{status,jdbcType=TINYINT},
       </if>
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
@@ -242,7 +242,7 @@
     update upms_system
     set icon = #{icon,jdbcType=VARCHAR},
       basepath = #{basepath,jdbcType=VARCHAR},
-      status = #{status,jdbcType=SMALLINT},
+      status = #{status,jdbcType=TINYINT},
       name = #{name,jdbcType=VARCHAR},
       ctime = #{ctime,jdbcType=BIGINT},
       orders = #{orders,jdbcType=BIGINT}

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.zheng.upms.dao.mapper.UpmsUserMapper">
   <resultMap id="BaseResultMap" type="com.zheng.upms.dao.model.UpmsUser">
     <id column="user_id" jdbcType="INTEGER" property="userId" />
-    <result column="system_id" jdbcType="INTEGER" property="systemId" />
     <result column="username" jdbcType="VARCHAR" property="username" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="salt" jdbcType="VARCHAR" property="salt" />
@@ -12,7 +11,7 @@
     <result column="phone" jdbcType="VARCHAR" property="phone" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="sex" jdbcType="TINYINT" property="sex" />
-    <result column="status" jdbcType="TINYINT" property="status" />
+    <result column="locked" jdbcType="TINYINT" property="locked" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -74,8 +73,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    user_id, system_id, username, password, salt, realname, avatar, phone, email, sex, 
-    status, ctime
+    user_id, username, password, salt, realname, avatar, phone, email, sex, locked, ctime
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsUserExample" resultMap="BaseResultMap">
     select
@@ -116,14 +114,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsUser">
-    insert into upms_user (user_id, system_id, username, 
-      password, salt, realname, 
-      avatar, phone, email, 
-      sex, status, ctime)
-    values (#{userId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, 
-      #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, #{realname,jdbcType=VARCHAR}, 
-      #{avatar,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
-      #{sex,jdbcType=TINYINT}, #{status,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT})
+    insert into upms_user (user_id, username, password, 
+      salt, realname, avatar, 
+      phone, email, sex, 
+      locked, ctime)
+    values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{salt,jdbcType=VARCHAR}, #{realname,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{sex,jdbcType=TINYINT}, 
+      #{locked,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsUser">
     insert into upms_user
@@ -131,9 +129,6 @@
       <if test="userId != null">
         user_id,
       </if>
-      <if test="systemId != null">
-        system_id,
-      </if>
       <if test="username != null">
         username,
       </if>
@@ -158,8 +153,8 @@
       <if test="sex != null">
         sex,
       </if>
-      <if test="status != null">
-        status,
+      <if test="locked != null">
+        locked,
       </if>
       <if test="ctime != null">
         ctime,
@@ -169,9 +164,6 @@
       <if test="userId != null">
         #{userId,jdbcType=INTEGER},
       </if>
-      <if test="systemId != null">
-        #{systemId,jdbcType=INTEGER},
-      </if>
       <if test="username != null">
         #{username,jdbcType=VARCHAR},
       </if>
@@ -196,8 +188,8 @@
       <if test="sex != null">
         #{sex,jdbcType=TINYINT},
       </if>
-      <if test="status != null">
-        #{status,jdbcType=TINYINT},
+      <if test="locked != null">
+        #{locked,jdbcType=TINYINT},
       </if>
       <if test="ctime != null">
         #{ctime,jdbcType=BIGINT},
@@ -216,9 +208,6 @@
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=INTEGER},
       </if>
-      <if test="record.systemId != null">
-        system_id = #{record.systemId,jdbcType=INTEGER},
-      </if>
       <if test="record.username != null">
         username = #{record.username,jdbcType=VARCHAR},
       </if>
@@ -243,8 +232,8 @@
       <if test="record.sex != null">
         sex = #{record.sex,jdbcType=TINYINT},
       </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=TINYINT},
+      <if test="record.locked != null">
+        locked = #{record.locked,jdbcType=TINYINT},
       </if>
       <if test="record.ctime != null">
         ctime = #{record.ctime,jdbcType=BIGINT},
@@ -257,7 +246,6 @@
   <update id="updateByExample" parameterType="map">
     update upms_user
     set user_id = #{record.userId,jdbcType=INTEGER},
-      system_id = #{record.systemId,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR},
       password = #{record.password,jdbcType=VARCHAR},
       salt = #{record.salt,jdbcType=VARCHAR},
@@ -266,7 +254,7 @@
       phone = #{record.phone,jdbcType=VARCHAR},
       email = #{record.email,jdbcType=VARCHAR},
       sex = #{record.sex,jdbcType=TINYINT},
-      status = #{record.status,jdbcType=TINYINT},
+      locked = #{record.locked,jdbcType=TINYINT},
       ctime = #{record.ctime,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -275,9 +263,6 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.zheng.upms.dao.model.UpmsUser">
     update upms_user
     <set>
-      <if test="systemId != null">
-        system_id = #{systemId,jdbcType=INTEGER},
-      </if>
       <if test="username != null">
         username = #{username,jdbcType=VARCHAR},
       </if>
@@ -302,8 +287,8 @@
       <if test="sex != null">
         sex = #{sex,jdbcType=TINYINT},
       </if>
-      <if test="status != null">
-        status = #{status,jdbcType=TINYINT},
+      <if test="locked != null">
+        locked = #{locked,jdbcType=TINYINT},
       </if>
       <if test="ctime != null">
         ctime = #{ctime,jdbcType=BIGINT},
@@ -313,8 +298,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.upms.dao.model.UpmsUser">
     update upms_user
-    set system_id = #{systemId,jdbcType=INTEGER},
-      username = #{username,jdbcType=VARCHAR},
+    set username = #{username,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},
       salt = #{salt,jdbcType=VARCHAR},
       realname = #{realname,jdbcType=VARCHAR},
@@ -322,7 +306,7 @@
       phone = #{phone,jdbcType=VARCHAR},
       email = #{email,jdbcType=VARCHAR},
       sex = #{sex,jdbcType=TINYINT},
-      status = #{status,jdbcType=TINYINT},
+      locked = #{locked,jdbcType=TINYINT},
       ctime = #{ctime,jdbcType=BIGINT}
     where user_id = #{userId,jdbcType=INTEGER}
   </update>

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml

@@ -5,7 +5,6 @@
     <id column="user_role_id" jdbcType="INTEGER" property="userRoleId" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="role_id" jdbcType="INTEGER" property="roleId" />
-    <result column="role" jdbcType="INTEGER" property="role" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -66,7 +65,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    user_role_id, user_id, role_id, role
+    user_role_id, user_id, role_id
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsUserRoleExample" resultMap="BaseResultMap">
     select
@@ -107,10 +106,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsUserRole">
-    insert into upms_user_role (user_role_id, user_id, role_id, 
-      role)
-    values (#{userRoleId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}, 
-      #{role,jdbcType=INTEGER})
+    insert into upms_user_role (user_role_id, user_id, role_id
+      )
+    values (#{userRoleId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsUserRole">
     insert into upms_user_role
@@ -124,9 +123,6 @@
       <if test="roleId != null">
         role_id,
       </if>
-      <if test="role != null">
-        role,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="userRoleId != null">
@@ -138,9 +134,6 @@
       <if test="roleId != null">
         #{roleId,jdbcType=INTEGER},
       </if>
-      <if test="role != null">
-        #{role,jdbcType=INTEGER},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.zheng.upms.dao.model.UpmsUserRoleExample" resultType="java.lang.Long">
@@ -161,9 +154,6 @@
       <if test="record.roleId != null">
         role_id = #{record.roleId,jdbcType=INTEGER},
       </if>
-      <if test="record.role != null">
-        role = #{record.role,jdbcType=INTEGER},
-      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -173,8 +163,7 @@
     update upms_user_role
     set user_role_id = #{record.userRoleId,jdbcType=INTEGER},
       user_id = #{record.userId,jdbcType=INTEGER},
-      role_id = #{record.roleId,jdbcType=INTEGER},
-      role = #{record.role,jdbcType=INTEGER}
+      role_id = #{record.roleId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -188,17 +177,13 @@
       <if test="roleId != null">
         role_id = #{roleId,jdbcType=INTEGER},
       </if>
-      <if test="role != null">
-        role = #{role,jdbcType=INTEGER},
-      </if>
     </set>
     where user_role_id = #{userRoleId,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.zheng.upms.dao.model.UpmsUserRole">
     update upms_user_role
     set user_id = #{userId,jdbcType=INTEGER},
-      role_id = #{roleId,jdbcType=INTEGER},
-      role = #{role,jdbcType=INTEGER}
+      role_id = #{roleId,jdbcType=INTEGER}
     where user_role_id = #{userRoleId,jdbcType=INTEGER}
   </update>
   <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsOrganization.java

@@ -10,13 +10,6 @@ public class UpmsOrganization implements Serializable {
      */
     private Integer organizationId;
 
-    /**
-     * 所属系统
-     *
-     * @mbg.generated
-     */
-    private Integer systemId;
-
     /**
      * 组织名称
      *
@@ -48,14 +41,6 @@ public class UpmsOrganization implements Serializable {
         this.organizationId = organizationId;
     }
 
-    public Integer getSystemId() {
-        return systemId;
-    }
-
-    public void setSystemId(Integer systemId) {
-        this.systemId = systemId;
-    }
-
     public String getName() {
         return name;
     }
@@ -87,7 +72,6 @@ public class UpmsOrganization implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", organizationId=").append(organizationId);
-        sb.append(", systemId=").append(systemId);
         sb.append(", name=").append(name);
         sb.append(", description=").append(description);
         sb.append(", ctime=").append(ctime);
@@ -108,7 +92,6 @@ public class UpmsOrganization implements Serializable {
         }
         UpmsOrganization other = (UpmsOrganization) that;
         return (this.getOrganizationId() == null ? other.getOrganizationId() == null : this.getOrganizationId().equals(other.getOrganizationId()))
-            && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
             && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()))
             && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()));
@@ -119,7 +102,6 @@ public class UpmsOrganization implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getOrganizationId() == null) ? 0 : getOrganizationId().hashCode());
-        result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode());
         result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
         result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
         result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsOrganizationExample.java

@@ -187,66 +187,6 @@ public class UpmsOrganizationExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdIsNull() {
-            addCriterion("system_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdIsNotNull() {
-            addCriterion("system_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdEqualTo(Integer value) {
-            addCriterion("system_id =", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotEqualTo(Integer value) {
-            addCriterion("system_id <>", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdGreaterThan(Integer value) {
-            addCriterion("system_id >", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("system_id >=", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdLessThan(Integer value) {
-            addCriterion("system_id <", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdLessThanOrEqualTo(Integer value) {
-            addCriterion("system_id <=", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdIn(List<Integer> values) {
-            addCriterion("system_id in", values, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotIn(List<Integer> values) {
-            addCriterion("system_id not in", values, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdBetween(Integer value1, Integer value2) {
-            addCriterion("system_id between", value1, value2, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("system_id not between", value1, value2, "systemId");
-            return (Criteria) this;
-        }
-
         public Criteria andNameIsNull() {
             addCriterion("name is null");
             return (Criteria) this;

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsPermission.java

@@ -17,6 +17,20 @@ public class UpmsPermission implements Serializable {
      */
     private Integer systemId;
 
+    /**
+     * 所属上级
+     *
+     * @mbg.generated
+     */
+    private Integer pid;
+
+    /**
+     * 类型(1:菜单,2:按钮)
+     *
+     * @mbg.generated
+     */
+    private Byte type;
+
     /**
      * 权限值
      *
@@ -24,6 +38,27 @@ public class UpmsPermission implements Serializable {
      */
     private String permissionValue;
 
+    /**
+     * 图标
+     *
+     * @mbg.generated
+     */
+    private String icon;
+
+    /**
+     * 创建时间
+     *
+     * @mbg.generated
+     */
+    private Long ctime;
+
+    /**
+     * 排序
+     *
+     * @mbg.generated
+     */
+    private Long orders;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getPermissionId() {
@@ -42,6 +77,22 @@ public class UpmsPermission implements Serializable {
         this.systemId = systemId;
     }
 
+    public Integer getPid() {
+        return pid;
+    }
+
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
     public String getPermissionValue() {
         return permissionValue;
     }
@@ -50,6 +101,30 @@ public class UpmsPermission implements Serializable {
         this.permissionValue = permissionValue;
     }
 
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public Long getCtime() {
+        return ctime;
+    }
+
+    public void setCtime(Long ctime) {
+        this.ctime = ctime;
+    }
+
+    public Long getOrders() {
+        return orders;
+    }
+
+    public void setOrders(Long orders) {
+        this.orders = orders;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -58,7 +133,12 @@ public class UpmsPermission implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", permissionId=").append(permissionId);
         sb.append(", systemId=").append(systemId);
+        sb.append(", pid=").append(pid);
+        sb.append(", type=").append(type);
         sb.append(", permissionValue=").append(permissionValue);
+        sb.append(", icon=").append(icon);
+        sb.append(", ctime=").append(ctime);
+        sb.append(", orders=").append(orders);
         sb.append("]");
         return sb.toString();
     }
@@ -77,7 +157,12 @@ public class UpmsPermission implements Serializable {
         UpmsPermission other = (UpmsPermission) that;
         return (this.getPermissionId() == null ? other.getPermissionId() == null : this.getPermissionId().equals(other.getPermissionId()))
             && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId()))
-            && (this.getPermissionValue() == null ? other.getPermissionValue() == null : this.getPermissionValue().equals(other.getPermissionValue()));
+            && (this.getPid() == null ? other.getPid() == null : this.getPid().equals(other.getPid()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getPermissionValue() == null ? other.getPermissionValue() == null : this.getPermissionValue().equals(other.getPermissionValue()))
+            && (this.getIcon() == null ? other.getIcon() == null : this.getIcon().equals(other.getIcon()))
+            && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()))
+            && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders()));
     }
 
     @Override
@@ -86,7 +171,12 @@ public class UpmsPermission implements Serializable {
         int result = 1;
         result = prime * result + ((getPermissionId() == null) ? 0 : getPermissionId().hashCode());
         result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode());
+        result = prime * result + ((getPid() == null) ? 0 : getPid().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
         result = prime * result + ((getPermissionValue() == null) ? 0 : getPermissionValue().hashCode());
+        result = prime * result + ((getIcon() == null) ? 0 : getIcon().hashCode());
+        result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());
+        result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode());
         return result;
     }
 }

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsPermissionExample.java

@@ -247,6 +247,126 @@ public class UpmsPermissionExample implements Serializable {
             return (Criteria) this;
         }
 
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(Integer value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(Integer value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(Integer value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(Integer value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(Integer value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<Integer> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<Integer> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(Integer value1, Integer value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(Integer value1, Integer value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
         public Criteria andPermissionValueIsNull() {
             addCriterion("permission_value is null");
             return (Criteria) this;
@@ -316,6 +436,196 @@ public class UpmsPermissionExample implements Serializable {
             addCriterion("permission_value not between", value1, value2, "permissionValue");
             return (Criteria) this;
         }
+
+        public Criteria andIconIsNull() {
+            addCriterion("icon is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconIsNotNull() {
+            addCriterion("icon is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconEqualTo(String value) {
+            addCriterion("icon =", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconNotEqualTo(String value) {
+            addCriterion("icon <>", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconGreaterThan(String value) {
+            addCriterion("icon >", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconGreaterThanOrEqualTo(String value) {
+            addCriterion("icon >=", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconLessThan(String value) {
+            addCriterion("icon <", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconLessThanOrEqualTo(String value) {
+            addCriterion("icon <=", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconLike(String value) {
+            addCriterion("icon like", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconNotLike(String value) {
+            addCriterion("icon not like", value, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconIn(List<String> values) {
+            addCriterion("icon in", values, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconNotIn(List<String> values) {
+            addCriterion("icon not in", values, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconBetween(String value1, String value2) {
+            addCriterion("icon between", value1, value2, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andIconNotBetween(String value1, String value2) {
+            addCriterion("icon not between", value1, value2, "icon");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeIsNull() {
+            addCriterion("ctime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeIsNotNull() {
+            addCriterion("ctime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeEqualTo(Long value) {
+            addCriterion("ctime =", value, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeNotEqualTo(Long value) {
+            addCriterion("ctime <>", value, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeGreaterThan(Long value) {
+            addCriterion("ctime >", value, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("ctime >=", value, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeLessThan(Long value) {
+            addCriterion("ctime <", value, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeLessThanOrEqualTo(Long value) {
+            addCriterion("ctime <=", value, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeIn(List<Long> values) {
+            addCriterion("ctime in", values, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeNotIn(List<Long> values) {
+            addCriterion("ctime not in", values, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeBetween(Long value1, Long value2) {
+            addCriterion("ctime between", value1, value2, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCtimeNotBetween(Long value1, Long value2) {
+            addCriterion("ctime not between", value1, value2, "ctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersIsNull() {
+            addCriterion("orders is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersIsNotNull() {
+            addCriterion("orders is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersEqualTo(Long value) {
+            addCriterion("orders =", value, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersNotEqualTo(Long value) {
+            addCriterion("orders <>", value, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersGreaterThan(Long value) {
+            addCriterion("orders >", value, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersGreaterThanOrEqualTo(Long value) {
+            addCriterion("orders >=", value, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersLessThan(Long value) {
+            addCriterion("orders <", value, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersLessThanOrEqualTo(Long value) {
+            addCriterion("orders <=", value, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersIn(List<Long> values) {
+            addCriterion("orders in", values, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersNotIn(List<Long> values) {
+            addCriterion("orders not in", values, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersBetween(Long value1, Long value2) {
+            addCriterion("orders between", value1, value2, "orders");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrdersNotBetween(Long value1, Long value2) {
+            addCriterion("orders not between", value1, value2, "orders");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria implements Serializable {

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRole.java

@@ -5,14 +5,10 @@ import java.io.Serializable;
 public class UpmsRole implements Serializable {
     private Integer roleId;
 
-    private Integer systemId;
-
     private String name;
 
     private String description;
 
-    private Byte status;
-
     private Long ctime;
 
     private Long orders;
@@ -27,14 +23,6 @@ public class UpmsRole implements Serializable {
         this.roleId = roleId;
     }
 
-    public Integer getSystemId() {
-        return systemId;
-    }
-
-    public void setSystemId(Integer systemId) {
-        this.systemId = systemId;
-    }
-
     public String getName() {
         return name;
     }
@@ -51,14 +39,6 @@ public class UpmsRole implements Serializable {
         this.description = description;
     }
 
-    public Byte getStatus() {
-        return status;
-    }
-
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
     public Long getCtime() {
         return ctime;
     }
@@ -82,10 +62,8 @@ public class UpmsRole implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", roleId=").append(roleId);
-        sb.append(", systemId=").append(systemId);
         sb.append(", name=").append(name);
         sb.append(", description=").append(description);
-        sb.append(", status=").append(status);
         sb.append(", ctime=").append(ctime);
         sb.append(", orders=").append(orders);
         sb.append("]");
@@ -105,10 +83,8 @@ public class UpmsRole implements Serializable {
         }
         UpmsRole other = (UpmsRole) that;
         return (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()))
-            && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
             && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()))
             && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders()));
     }
@@ -118,10 +94,8 @@ public class UpmsRole implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode());
-        result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode());
         result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
         result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());
         result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode());
         return result;

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsRoleExample.java

@@ -187,66 +187,6 @@ public class UpmsRoleExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdIsNull() {
-            addCriterion("system_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdIsNotNull() {
-            addCriterion("system_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdEqualTo(Integer value) {
-            addCriterion("system_id =", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotEqualTo(Integer value) {
-            addCriterion("system_id <>", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdGreaterThan(Integer value) {
-            addCriterion("system_id >", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("system_id >=", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdLessThan(Integer value) {
-            addCriterion("system_id <", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdLessThanOrEqualTo(Integer value) {
-            addCriterion("system_id <=", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdIn(List<Integer> values) {
-            addCriterion("system_id in", values, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotIn(List<Integer> values) {
-            addCriterion("system_id not in", values, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdBetween(Integer value1, Integer value2) {
-            addCriterion("system_id between", value1, value2, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("system_id not between", value1, value2, "systemId");
-            return (Criteria) this;
-        }
-
         public Criteria andNameIsNull() {
             addCriterion("name is null");
             return (Criteria) this;
@@ -387,66 +327,6 @@ public class UpmsRoleExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusEqualTo(Byte value) {
-            addCriterion("status =", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotEqualTo(Byte value) {
-            addCriterion("status <>", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThan(Byte value) {
-            addCriterion("status >", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("status >=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThan(Byte value) {
-            addCriterion("status <", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("status <=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIn(List<Byte> values) {
-            addCriterion("status in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotIn(List<Byte> values) {
-            addCriterion("status not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(Byte value1, Byte value2) {
-            addCriterion("status between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("status not between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
         public Criteria andCtimeIsNull() {
             addCriterion("ctime is null");
             return (Criteria) this;

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsSystem.java

@@ -3,18 +3,53 @@ package com.zheng.upms.dao.model;
 import java.io.Serializable;
 
 public class UpmsSystem implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbg.generated
+     */
     private Integer systemId;
 
+    /**
+     * 图标
+     *
+     * @mbg.generated
+     */
     private String icon;
 
+    /**
+     * 根目录
+     *
+     * @mbg.generated
+     */
     private String basepath;
 
-    private Short status;
-
+    /**
+     * 状态(-1:黑名单,1:正常)
+     *
+     * @mbg.generated
+     */
+    private Byte status;
+
+    /**
+     * 系统名称
+     *
+     * @mbg.generated
+     */
     private String name;
 
+    /**
+     * 创建时间
+     *
+     * @mbg.generated
+     */
     private Long ctime;
 
+    /**
+     * 排序
+     *
+     * @mbg.generated
+     */
     private Long orders;
 
     private static final long serialVersionUID = 1L;
@@ -43,11 +78,11 @@ public class UpmsSystem implements Serializable {
         this.basepath = basepath;
     }
 
-    public Short getStatus() {
+    public Byte getStatus() {
         return status;
     }
 
-    public void setStatus(Short status) {
+    public void setStatus(Byte status) {
         this.status = status;
     }
 

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsSystemExample.java

@@ -337,52 +337,52 @@ public class UpmsSystemExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Short value) {
+        public Criteria andStatusEqualTo(Byte value) {
             addCriterion("status =", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Short value) {
+        public Criteria andStatusNotEqualTo(Byte value) {
             addCriterion("status <>", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Short value) {
+        public Criteria andStatusGreaterThan(Byte value) {
             addCriterion("status >", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Short value) {
+        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
             addCriterion("status >=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Short value) {
+        public Criteria andStatusLessThan(Byte value) {
             addCriterion("status <", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Short value) {
+        public Criteria andStatusLessThanOrEqualTo(Byte value) {
             addCriterion("status <=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Short> values) {
+        public Criteria andStatusIn(List<Byte> values) {
             addCriterion("status in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Short> values) {
+        public Criteria andStatusNotIn(List<Byte> values) {
             addCriterion("status not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Short value1, Short value2) {
+        public Criteria andStatusBetween(Byte value1, Byte value2) {
             addCriterion("status between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Short value1, Short value2) {
+        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
             addCriterion("status not between", value1, value2, "status");
             return (Criteria) this;
         }

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUser.java

@@ -10,13 +10,6 @@ public class UpmsUser implements Serializable {
      */
     private Integer userId;
 
-    /**
-     * 所属系统
-     *
-     * @mbg.generated
-     */
-    private Integer systemId;
-
     /**
      * 帐号
      *
@@ -74,11 +67,11 @@ public class UpmsUser implements Serializable {
     private Byte sex;
 
     /**
-     * 状态(-1:封,0:未审核,1:正常)
+     * 状态(0:正常,1:锁定)
      *
      * @mbg.generated
      */
-    private Byte status;
+    private Byte locked;
 
     /**
      * 创建时间
@@ -97,14 +90,6 @@ public class UpmsUser implements Serializable {
         this.userId = userId;
     }
 
-    public Integer getSystemId() {
-        return systemId;
-    }
-
-    public void setSystemId(Integer systemId) {
-        this.systemId = systemId;
-    }
-
     public String getUsername() {
         return username;
     }
@@ -169,12 +154,12 @@ public class UpmsUser implements Serializable {
         this.sex = sex;
     }
 
-    public Byte getStatus() {
-        return status;
+    public Byte getLocked() {
+        return locked;
     }
 
-    public void setStatus(Byte status) {
-        this.status = status;
+    public void setLocked(Byte locked) {
+        this.locked = locked;
     }
 
     public Long getCtime() {
@@ -192,7 +177,6 @@ public class UpmsUser implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", userId=").append(userId);
-        sb.append(", systemId=").append(systemId);
         sb.append(", username=").append(username);
         sb.append(", password=").append(password);
         sb.append(", salt=").append(salt);
@@ -201,7 +185,7 @@ public class UpmsUser implements Serializable {
         sb.append(", phone=").append(phone);
         sb.append(", email=").append(email);
         sb.append(", sex=").append(sex);
-        sb.append(", status=").append(status);
+        sb.append(", locked=").append(locked);
         sb.append(", ctime=").append(ctime);
         sb.append("]");
         return sb.toString();
@@ -220,7 +204,6 @@ public class UpmsUser implements Serializable {
         }
         UpmsUser other = (UpmsUser) that;
         return (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
-            && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId()))
             && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
             && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
             && (this.getSalt() == null ? other.getSalt() == null : this.getSalt().equals(other.getSalt()))
@@ -229,7 +212,7 @@ public class UpmsUser implements Serializable {
             && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
             && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
             && (this.getSex() == null ? other.getSex() == null : this.getSex().equals(other.getSex()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getLocked() == null ? other.getLocked() == null : this.getLocked().equals(other.getLocked()))
             && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()));
     }
 
@@ -238,7 +221,6 @@ public class UpmsUser implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
-        result = prime * result + ((getSystemId() == null) ? 0 : getSystemId().hashCode());
         result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
         result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
         result = prime * result + ((getSalt() == null) ? 0 : getSalt().hashCode());
@@ -247,7 +229,7 @@ public class UpmsUser implements Serializable {
         result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
         result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
         result = prime * result + ((getSex() == null) ? 0 : getSex().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getLocked() == null) ? 0 : getLocked().hashCode());
         result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());
         return result;
     }

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserExample.java

@@ -187,66 +187,6 @@ public class UpmsUserExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andSystemIdIsNull() {
-            addCriterion("system_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdIsNotNull() {
-            addCriterion("system_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdEqualTo(Integer value) {
-            addCriterion("system_id =", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotEqualTo(Integer value) {
-            addCriterion("system_id <>", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdGreaterThan(Integer value) {
-            addCriterion("system_id >", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("system_id >=", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdLessThan(Integer value) {
-            addCriterion("system_id <", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdLessThanOrEqualTo(Integer value) {
-            addCriterion("system_id <=", value, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdIn(List<Integer> values) {
-            addCriterion("system_id in", values, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotIn(List<Integer> values) {
-            addCriterion("system_id not in", values, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdBetween(Integer value1, Integer value2) {
-            addCriterion("system_id between", value1, value2, "systemId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSystemIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("system_id not between", value1, value2, "systemId");
-            return (Criteria) this;
-        }
-
         public Criteria andUsernameIsNull() {
             addCriterion("username is null");
             return (Criteria) this;
@@ -797,63 +737,63 @@ public class UpmsUserExample implements Serializable {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("status is null");
+        public Criteria andLockedIsNull() {
+            addCriterion("locked is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
+        public Criteria andLockedIsNotNull() {
+            addCriterion("locked is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Byte value) {
-            addCriterion("status =", value, "status");
+        public Criteria andLockedEqualTo(Byte value) {
+            addCriterion("locked =", value, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Byte value) {
-            addCriterion("status <>", value, "status");
+        public Criteria andLockedNotEqualTo(Byte value) {
+            addCriterion("locked <>", value, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Byte value) {
-            addCriterion("status >", value, "status");
+        public Criteria andLockedGreaterThan(Byte value) {
+            addCriterion("locked >", value, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("status >=", value, "status");
+        public Criteria andLockedGreaterThanOrEqualTo(Byte value) {
+            addCriterion("locked >=", value, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Byte value) {
-            addCriterion("status <", value, "status");
+        public Criteria andLockedLessThan(Byte value) {
+            addCriterion("locked <", value, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("status <=", value, "status");
+        public Criteria andLockedLessThanOrEqualTo(Byte value) {
+            addCriterion("locked <=", value, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Byte> values) {
-            addCriterion("status in", values, "status");
+        public Criteria andLockedIn(List<Byte> values) {
+            addCriterion("locked in", values, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Byte> values) {
-            addCriterion("status not in", values, "status");
+        public Criteria andLockedNotIn(List<Byte> values) {
+            addCriterion("locked not in", values, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Byte value1, Byte value2) {
-            addCriterion("status between", value1, value2, "status");
+        public Criteria andLockedBetween(Byte value1, Byte value2) {
+            addCriterion("locked between", value1, value2, "locked");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("status not between", value1, value2, "status");
+        public Criteria andLockedNotBetween(Byte value1, Byte value2) {
+            addCriterion("locked not between", value1, value2, "locked");
             return (Criteria) this;
         }
 

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserRole.java

@@ -9,8 +9,6 @@ public class UpmsUserRole implements Serializable {
 
     private Integer roleId;
 
-    private Integer role;
-
     private static final long serialVersionUID = 1L;
 
     public Integer getUserRoleId() {
@@ -37,14 +35,6 @@ public class UpmsUserRole implements Serializable {
         this.roleId = roleId;
     }
 
-    public Integer getRole() {
-        return role;
-    }
-
-    public void setRole(Integer role) {
-        this.role = role;
-    }
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -54,7 +44,6 @@ public class UpmsUserRole implements Serializable {
         sb.append(", userRoleId=").append(userRoleId);
         sb.append(", userId=").append(userId);
         sb.append(", roleId=").append(roleId);
-        sb.append(", role=").append(role);
         sb.append("]");
         return sb.toString();
     }
@@ -73,8 +62,7 @@ public class UpmsUserRole implements Serializable {
         UpmsUserRole other = (UpmsUserRole) that;
         return (this.getUserRoleId() == null ? other.getUserRoleId() == null : this.getUserRoleId().equals(other.getUserRoleId()))
             && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
-            && (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()))
-            && (this.getRole() == null ? other.getRole() == null : this.getRole().equals(other.getRole()));
+            && (this.getRoleId() == null ? other.getRoleId() == null : this.getRoleId().equals(other.getRoleId()));
     }
 
     @Override
@@ -84,7 +72,6 @@ public class UpmsUserRole implements Serializable {
         result = prime * result + ((getUserRoleId() == null) ? 0 : getUserRoleId().hashCode());
         result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
         result = prime * result + ((getRoleId() == null) ? 0 : getRoleId().hashCode());
-        result = prime * result + ((getRole() == null) ? 0 : getRole().hashCode());
         return result;
     }
 }

zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/model/UpmsUserRoleExample.java

@@ -306,66 +306,6 @@ public class UpmsUserRoleExample implements Serializable {
             addCriterion("role_id not between", value1, value2, "roleId");
             return (Criteria) this;
         }
-
-        public Criteria andRoleIsNull() {
-            addCriterion("role is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleIsNotNull() {
-            addCriterion("role is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleEqualTo(Integer value) {
-            addCriterion("role =", value, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleNotEqualTo(Integer value) {
-            addCriterion("role <>", value, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleGreaterThan(Integer value) {
-            addCriterion("role >", value, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleGreaterThanOrEqualTo(Integer value) {
-            addCriterion("role >=", value, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleLessThan(Integer value) {
-            addCriterion("role <", value, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleLessThanOrEqualTo(Integer value) {
-            addCriterion("role <=", value, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleIn(List<Integer> values) {
-            addCriterion("role in", values, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleNotIn(List<Integer> values) {
-            addCriterion("role not in", values, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleBetween(Integer value1, Integer value2) {
-            addCriterion("role between", value1, value2, "role");
-            return (Criteria) this;
-        }
-
-        public Criteria andRoleNotBetween(Integer value1, Integer value2) {
-            addCriterion("role not between", value1, value2, "role");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria implements Serializable {

zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsOrganizationService.java

@@ -0,0 +1,14 @@
+package com.zheng.upms.rpc.api;
+
+import com.zheng.common.base.BaseService;
+import com.zheng.upms.dao.model.UpmsOrganization;
+import com.zheng.upms.dao.model.UpmsOrganizationExample;
+
+/**
+ * 组织service接口
+ * Created by shuzheng on 2017/2/6.
+ */
+public interface UpmsOrganizationService extends BaseService<UpmsOrganization, UpmsOrganizationExample> {
+
+
+}

zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsOrganizationServiceImpl.java

@@ -0,0 +1,27 @@
+package com.zheng.upms.rpc.service.impl;
+
+import com.zheng.common.base.BaseServiceImpl;
+import com.zheng.upms.dao.mapper.UpmsOrganizationMapper;
+import com.zheng.upms.dao.model.UpmsOrganization;
+import com.zheng.upms.dao.model.UpmsOrganizationExample;
+import com.zheng.upms.rpc.api.UpmsOrganizationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 组织service实现
+ * Created by shuzheng on 2017/2/6.
+ */
+@Service
+@Transactional
+public class UpmsOrganizationServiceImpl extends BaseServiceImpl<UpmsOrganizationMapper, UpmsOrganization, UpmsOrganizationExample> implements UpmsOrganizationService {
+
+    private static Logger _log = LoggerFactory.getLogger(UpmsOrganizationServiceImpl.class);
+
+    @Autowired
+    UpmsOrganizationMapper upmsOrganizationMapper;
+
+}

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/UpmsOrganizationController.java

@@ -0,0 +1,22 @@
+package com.zheng.upms.admin.controller.manage;
+
+import com.zheng.common.base.BaseController;
+import io.swagger.annotations.Api;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 系统controller
+ * Created by shuzheng on 2017/2/6.
+ */
+@Controller
+@Api(value = "组织管理", description = "组织管理")
+@RequestMapping("/manage/organization")
+public class UpmsOrganizationController extends BaseController {
+
+    private static Logger _log = LoggerFactory.getLogger(UpmsOrganizationController.class);
+
+
+}

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/SystemController.java → zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/controller/manage/UpmsSystemController.java

@@ -22,11 +22,11 @@ import java.util.List;
  * Created by shuzheng on 2016/12/18.
  */
 @Controller
-@Api(value = "系统管理", description = "注册系统管理")
+@Api(value = "系统管理", description = "系统管理")
 @RequestMapping("/manage/system")
-public class SystemController extends BaseController {
+public class UpmsSystemController extends BaseController {
 
-	private static Logger _log = LoggerFactory.getLogger(SystemController.class);
+	private static Logger _log = LoggerFactory.getLogger(UpmsSystemController.class);
 
 	@Autowired
 	private UpmsSystemService upmsSystemService;

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/admin/realm/UpmsRealm.java

@@ -70,7 +70,7 @@ public class UpmsRealm extends AuthorizingRealm {
         if (!upmsUser.getPassword().equals(MD5Util.MD5(password + upmsUser.getSalt()))) {
             throw new IncorrectCredentialsException("密码错误！");
         }
-        if (upmsUser.getStatus() == -1) {
+        if (upmsUser.getLocked() == 1) {
             throw new LockedAccountException("账号已被锁定！");
         }