更新数据模型

project-datamodel/zheng.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1486385652" Name="zheng" Objects="415" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{22E867D0-73E2-4C77-BB68-28135519D681}" Label="" LastModificationDate="1486386357" Name="zheng" Objects="415" Symbols="67" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -12,7 +12,7 @@
 <a:Code>zheng</a:Code>
 <a:CreationDate>1478091682</a:CreationDate>
 <a:Creator>shuzheng</a:Creator>
-<a:ModificationDate>1486384936</a:ModificationDate>
+<a:ModificationDate>1486386357</a:ModificationDate>
 <a:Modifier>shuzheng</a:Modifier>
 <a:PackageOptionsText>[FolderOptions]
 
@@ -76,7 +76,7 @@ UpdateTableStatistics=Yes
 UpdateColumnStatistics=Yes
 
 [FolderOptions\Physical Objects\Database Generation]
-GenScriptName=update.sql
+GenScriptName=zheng.sql
 GenScriptName0=crebas.sql
 GenScriptName1=crebas
 GenScriptName2=

project-datamodel/zheng.sql

@@ -2,15 +2,15 @@
 Navicat MySQL Data Transfer
 
 Source Server         : localhost
-Source Server Version : 50621
+Source Server Version : 50528
 Source Host           : localhost:3306
 Source Database       : zheng
 
 Target Server Type    : MYSQL
-Target Server Version : 50621
+Target Server Version : 50528
 File Encoding         : 65001
 
-Date: 2017-02-06 23:59:40
+Date: 2017-02-10 13:47:41
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -399,6 +399,26 @@ CREATE TABLE `pay_vest` (
 -- Records of pay_vest
 -- ----------------------------
 
+-- ----------------------------
+-- 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 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 DEFAULT CHARSET=utf8mb4 COMMENT='权限';
+
+-- ----------------------------
+-- Records of tmp_upms_permission
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for upms_organization
 -- ----------------------------
@@ -423,12 +443,17 @@ 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 '所属上级',
+  `name` varchar(20) DEFAULT NULL COMMENT '名称',
   `type` tinyint(4) DEFAULT NULL COMMENT '类型(1:菜单,2:按钮)',
   `permission_value` varchar(20) DEFAULT NULL COMMENT '权限值',
+  `uri` varchar(100) DEFAULT NULL COMMENT '路径',
   `icon` varchar(20) DEFAULT NULL COMMENT '图标',
+  `status` tinyint(4) DEFAULT NULL COMMENT '状态(0:禁止,1:正常)',
   `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
   `orders` bigint(20) DEFAULT NULL COMMENT '排序',
-  PRIMARY KEY (`permission_id`)
+  PRIMARY KEY (`permission_id`),
+  KEY `FK_Reference_29` (`system_id`),
+  CONSTRAINT `FK_Reference_29` FOREIGN KEY (`system_id`) REFERENCES `upms_system` (`system_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限';
 
 -- ----------------------------
@@ -460,7 +485,9 @@ 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`)
+  PRIMARY KEY (`role_permission_id`),
+  KEY `FK_Reference_22` (`permission_id`),
+  CONSTRAINT `FK_Reference_22` FOREIGN KEY (`permission_id`) REFERENCES `upms_permission` (`permission_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色权限关联表';
 
 -- ----------------------------
@@ -535,7 +562,9 @@ 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`)
+  PRIMARY KEY (`user_permission_id`),
+  KEY `FK_Reference_25` (`permission_id`),
+  CONSTRAINT `FK_Reference_25` FOREIGN KEY (`permission_id`) REFERENCES `upms_permission` (`permission_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户权限关联表';
 
 -- ----------------------------

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

@@ -5,9 +5,12 @@
     <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="name" jdbcType="VARCHAR" property="name" />
     <result column="type" jdbcType="TINYINT" property="type" />
     <result column="permission_value" jdbcType="VARCHAR" property="permissionValue" />
+    <result column="uri" jdbcType="VARCHAR" property="uri" />
     <result column="icon" jdbcType="VARCHAR" property="icon" />
+    <result column="status" jdbcType="TINYINT" property="status" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
     <result column="orders" jdbcType="BIGINT" property="orders" />
   </resultMap>
@@ -70,7 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    permission_id, system_id, pid, type, permission_value, icon, ctime, orders
+    permission_id, system_id, pid, name, type, permission_value, uri, icon, status, ctime, 
+    orders
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsPermissionExample" resultMap="BaseResultMap">
     select
@@ -112,10 +116,12 @@
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsPermission">
     insert into upms_permission (permission_id, system_id, pid, 
-      type, permission_value, icon, 
+      name, type, permission_value, 
+      uri, icon, status, 
       ctime, orders)
     values (#{permissionId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, 
-      #{type,jdbcType=TINYINT}, #{permissionValue,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, 
+      #{name,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, #{permissionValue,jdbcType=VARCHAR}, 
+      #{uri,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, 
       #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsPermission">
@@ -130,15 +136,24 @@
       <if test="pid != null">
         pid,
       </if>
+      <if test="name != null">
+        name,
+      </if>
       <if test="type != null">
         type,
       </if>
       <if test="permissionValue != null">
         permission_value,
       </if>
+      <if test="uri != null">
+        uri,
+      </if>
       <if test="icon != null">
         icon,
       </if>
+      <if test="status != null">
+        status,
+      </if>
       <if test="ctime != null">
         ctime,
       </if>
@@ -156,15 +171,24 @@
       <if test="pid != null">
         #{pid,jdbcType=INTEGER},
       </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
       <if test="type != null">
         #{type,jdbcType=TINYINT},
       </if>
       <if test="permissionValue != null">
         #{permissionValue,jdbcType=VARCHAR},
       </if>
+      <if test="uri != null">
+        #{uri,jdbcType=VARCHAR},
+      </if>
       <if test="icon != null">
         #{icon,jdbcType=VARCHAR},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=TINYINT},
+      </if>
       <if test="ctime != null">
         #{ctime,jdbcType=BIGINT},
       </if>
@@ -191,15 +215,24 @@
       <if test="record.pid != null">
         pid = #{record.pid,jdbcType=INTEGER},
       </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </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.uri != null">
+        uri = #{record.uri,jdbcType=VARCHAR},
+      </if>
       <if test="record.icon != null">
         icon = #{record.icon,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>
@@ -216,9 +249,12 @@
     set permission_id = #{record.permissionId,jdbcType=INTEGER},
       system_id = #{record.systemId,jdbcType=INTEGER},
       pid = #{record.pid,jdbcType=INTEGER},
+      name = #{record.name,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=TINYINT},
       permission_value = #{record.permissionValue,jdbcType=VARCHAR},
+      uri = #{record.uri,jdbcType=VARCHAR},
       icon = #{record.icon,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=TINYINT},
       ctime = #{record.ctime,jdbcType=BIGINT},
       orders = #{record.orders,jdbcType=BIGINT}
     <if test="_parameter != null">
@@ -234,15 +270,24 @@
       <if test="pid != null">
         pid = #{pid,jdbcType=INTEGER},
       </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
       <if test="type != null">
         type = #{type,jdbcType=TINYINT},
       </if>
       <if test="permissionValue != null">
         permission_value = #{permissionValue,jdbcType=VARCHAR},
       </if>
+      <if test="uri != null">
+        uri = #{uri,jdbcType=VARCHAR},
+      </if>
       <if test="icon != null">
         icon = #{icon,jdbcType=VARCHAR},
       </if>
+      <if test="status != null">
+        status = #{status,jdbcType=TINYINT},
+      </if>
       <if test="ctime != null">
         ctime = #{ctime,jdbcType=BIGINT},
       </if>
@@ -256,9 +301,12 @@
     update upms_permission
     set system_id = #{systemId,jdbcType=INTEGER},
       pid = #{pid,jdbcType=INTEGER},
+      name = #{name,jdbcType=VARCHAR},
       type = #{type,jdbcType=TINYINT},
       permission_value = #{permissionValue,jdbcType=VARCHAR},
+      uri = #{uri,jdbcType=VARCHAR},
       icon = #{icon,jdbcType=VARCHAR},
+      status = #{status,jdbcType=TINYINT},
       ctime = #{ctime,jdbcType=BIGINT},
       orders = #{orders,jdbcType=BIGINT}
     where permission_id = #{permissionId,jdbcType=INTEGER}

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

@@ -24,6 +24,13 @@ public class UpmsPermission implements Serializable {
      */
     private Integer pid;
 
+    /**
+     * 名称
+     *
+     * @mbg.generated
+     */
+    private String name;
+
     /**
      * 类型(1:菜单,2:按钮)
      *
@@ -38,6 +45,13 @@ public class UpmsPermission implements Serializable {
      */
     private String permissionValue;
 
+    /**
+     * 路径
+     *
+     * @mbg.generated
+     */
+    private String uri;
+
     /**
      * 图标
      *
@@ -45,6 +59,13 @@ public class UpmsPermission implements Serializable {
      */
     private String icon;
 
+    /**
+     * 状态(0:禁止,1:正常)
+     *
+     * @mbg.generated
+     */
+    private Byte status;
+
     /**
      * 创建时间
      *
@@ -85,6 +106,14 @@ public class UpmsPermission implements Serializable {
         this.pid = pid;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public Byte getType() {
         return type;
     }
@@ -101,6 +130,14 @@ public class UpmsPermission implements Serializable {
         this.permissionValue = permissionValue;
     }
 
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
     public String getIcon() {
         return icon;
     }
@@ -109,6 +146,14 @@ public class UpmsPermission implements Serializable {
         this.icon = icon;
     }
 
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
     public Long getCtime() {
         return ctime;
     }
@@ -134,9 +179,12 @@ public class UpmsPermission implements Serializable {
         sb.append(", permissionId=").append(permissionId);
         sb.append(", systemId=").append(systemId);
         sb.append(", pid=").append(pid);
+        sb.append(", name=").append(name);
         sb.append(", type=").append(type);
         sb.append(", permissionValue=").append(permissionValue);
+        sb.append(", uri=").append(uri);
         sb.append(", icon=").append(icon);
+        sb.append(", status=").append(status);
         sb.append(", ctime=").append(ctime);
         sb.append(", orders=").append(orders);
         sb.append("]");
@@ -158,9 +206,12 @@ public class UpmsPermission implements Serializable {
         return (this.getPermissionId() == null ? other.getPermissionId() == null : this.getPermissionId().equals(other.getPermissionId()))
             && (this.getSystemId() == null ? other.getSystemId() == null : this.getSystemId().equals(other.getSystemId()))
             && (this.getPid() == null ? other.getPid() == null : this.getPid().equals(other.getPid()))
+            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
             && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
             && (this.getPermissionValue() == null ? other.getPermissionValue() == null : this.getPermissionValue().equals(other.getPermissionValue()))
+            && (this.getUri() == null ? other.getUri() == null : this.getUri().equals(other.getUri()))
             && (this.getIcon() == null ? other.getIcon() == null : this.getIcon().equals(other.getIcon()))
+            && (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()));
     }
@@ -172,9 +223,12 @@ public class UpmsPermission implements Serializable {
         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 + ((getName() == null) ? 0 : getName().hashCode());
         result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
         result = prime * result + ((getPermissionValue() == null) ? 0 : getPermissionValue().hashCode());
+        result = prime * result + ((getUri() == null) ? 0 : getUri().hashCode());
         result = prime * result + ((getIcon() == null) ? 0 : getIcon().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/UpmsPermissionExample.java

@@ -307,6 +307,76 @@ public class UpmsPermissionExample implements Serializable {
             return (Criteria) this;
         }
 
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
         public Criteria andTypeIsNull() {
             addCriterion("type is null");
             return (Criteria) this;
@@ -437,6 +507,76 @@ public class UpmsPermissionExample implements Serializable {
             return (Criteria) this;
         }
 
+        public Criteria andUriIsNull() {
+            addCriterion("uri is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriIsNotNull() {
+            addCriterion("uri is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriEqualTo(String value) {
+            addCriterion("uri =", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriNotEqualTo(String value) {
+            addCriterion("uri <>", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriGreaterThan(String value) {
+            addCriterion("uri >", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriGreaterThanOrEqualTo(String value) {
+            addCriterion("uri >=", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriLessThan(String value) {
+            addCriterion("uri <", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriLessThanOrEqualTo(String value) {
+            addCriterion("uri <=", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriLike(String value) {
+            addCriterion("uri like", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriNotLike(String value) {
+            addCriterion("uri not like", value, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriIn(List<String> values) {
+            addCriterion("uri in", values, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriNotIn(List<String> values) {
+            addCriterion("uri not in", values, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriBetween(String value1, String value2) {
+            addCriterion("uri between", value1, value2, "uri");
+            return (Criteria) this;
+        }
+
+        public Criteria andUriNotBetween(String value1, String value2) {
+            addCriterion("uri not between", value1, value2, "uri");
+            return (Criteria) this;
+        }
+
         public Criteria andIconIsNull() {
             addCriterion("icon is null");
             return (Criteria) this;
@@ -507,6 +647,66 @@ public class UpmsPermissionExample 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;