فهرست منبع

更新数据模型

shuzheng 9 سال پیش
والد
کامیت
f2f1d55ab1

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 140 - 114
project-datamodel/zheng.apm


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 151 - 115
project-datamodel/zheng.pdb


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 138 - 114
project-datamodel/zheng.pdm


BIN
project-datamodel/zheng.png


+ 5 - 23
project-datamodel/zheng.sql

@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50528
 File Encoding         : 65001
 
-Date: 2017-02-10 13:47:41
+Date: 2017-02-10 14:17:39
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -399,26 +399,6 @@ 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
 -- ----------------------------
@@ -504,6 +484,8 @@ CREATE TABLE `upms_system` (
   `basepath` varchar(100) DEFAULT NULL COMMENT '根目录',
   `status` tinyint(4) DEFAULT NULL COMMENT '状态(-1:黑名单,1:正常)',
   `name` varchar(20) DEFAULT NULL COMMENT '系统名称',
+  `title` varchar(20) DEFAULT NULL COMMENT '系统标题',
+  `description` varchar(300) DEFAULT NULL COMMENT '系统描述',
   `ctime` bigint(20) DEFAULT NULL COMMENT '创建时间',
   `orders` bigint(20) DEFAULT NULL COMMENT '排序',
   PRIMARY KEY (`system_id`)
@@ -512,8 +494,8 @@ CREATE TABLE `upms_system` (
 -- ----------------------------
 -- Records of upms_system
 -- ----------------------------
-INSERT INTO `upms_system` VALUES ('3', 'zmdi zmdi-widgets', 'http://cms.zhangshuzheng.cn:2222', '1', 'zheng-cms-admin', '3', '3');
-INSERT INTO `upms_system` VALUES ('4', 'zmdi zmdi-widgets', 'http://upms.zhangshuzheng.cn:1111', '1', 'zheng-upms-server', '4', '4');
+INSERT INTO `upms_system` VALUES ('3', 'zmdi zmdi-widgets', 'http://cms.zhangshuzheng.cn:2222', '1', 'zheng-cms-admin', '内容管理系统后台', null, '3', '3');
+INSERT INTO `upms_system` VALUES ('4', 'zmdi zmdi-widgets', 'http://upms.zhangshuzheng.cn:1111', '1', 'zheng-upms-server', '权限管理系统', null, '4', '4');
 
 -- ----------------------------
 -- Table structure for upms_user

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

@@ -7,6 +7,8 @@
     <result column="basepath" jdbcType="VARCHAR" property="basepath" />
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="ctime" jdbcType="BIGINT" property="ctime" />
     <result column="orders" jdbcType="BIGINT" property="orders" />
   </resultMap>
@@ -69,7 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    system_id, icon, basepath, status, name, ctime, orders
+    system_id, icon, basepath, status, name, title, description, ctime, orders
   </sql>
   <select id="selectByExample" parameterType="com.zheng.upms.dao.model.UpmsSystemExample" resultMap="BaseResultMap">
     select
@@ -111,11 +113,13 @@
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsSystem">
     insert into upms_system (system_id, icon, basepath, 
-      status, name, ctime, 
-      orders)
+      status, name, title, 
+      description, ctime, orders
+      )
     values (#{systemId,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, #{basepath,jdbcType=VARCHAR}, 
-      #{status,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
-      #{orders,jdbcType=BIGINT})
+      #{status,jdbcType=TINYINT}, #{name,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsSystem">
     insert into upms_system
@@ -135,6 +139,12 @@
       <if test="name != null">
         name,
       </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
       <if test="ctime != null">
         ctime,
       </if>
@@ -158,6 +168,12 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
       <if test="ctime != null">
         #{ctime,jdbcType=BIGINT},
       </if>
@@ -190,6 +206,12 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
       <if test="record.ctime != null">
         ctime = #{record.ctime,jdbcType=BIGINT},
       </if>
@@ -208,6 +230,8 @@
       basepath = #{record.basepath,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=TINYINT},
       name = #{record.name,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=VARCHAR},
       ctime = #{record.ctime,jdbcType=BIGINT},
       orders = #{record.orders,jdbcType=BIGINT}
     <if test="_parameter != null">
@@ -229,6 +253,12 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
       <if test="ctime != null">
         ctime = #{ctime,jdbcType=BIGINT},
       </if>
@@ -244,6 +274,8 @@
       basepath = #{basepath,jdbcType=VARCHAR},
       status = #{status,jdbcType=TINYINT},
       name = #{name,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
       ctime = #{ctime,jdbcType=BIGINT},
       orders = #{orders,jdbcType=BIGINT}
     where system_id = #{systemId,jdbcType=INTEGER}

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

@@ -38,6 +38,20 @@ public class UpmsSystem implements Serializable {
      */
     private String name;
 
+    /**
+     * 系统标题
+     *
+     * @mbg.generated
+     */
+    private String title;
+
+    /**
+     * 系统描述
+     *
+     * @mbg.generated
+     */
+    private String description;
+
     /**
      * 创建时间
      *
@@ -94,6 +108,22 @@ public class UpmsSystem implements Serializable {
         this.name = name;
     }
 
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public Long getCtime() {
         return ctime;
     }
@@ -121,6 +151,8 @@ public class UpmsSystem implements Serializable {
         sb.append(", basepath=").append(basepath);
         sb.append(", status=").append(status);
         sb.append(", name=").append(name);
+        sb.append(", title=").append(title);
+        sb.append(", description=").append(description);
         sb.append(", ctime=").append(ctime);
         sb.append(", orders=").append(orders);
         sb.append("]");
@@ -144,6 +176,8 @@ public class UpmsSystem implements Serializable {
             && (this.getBasepath() == null ? other.getBasepath() == null : this.getBasepath().equals(other.getBasepath()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle()))
+            && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()))
             && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()))
             && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders()));
     }
@@ -157,6 +191,8 @@ public class UpmsSystem implements Serializable {
         result = prime * result + ((getBasepath() == null) ? 0 : getBasepath().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode());
+        result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
         result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());
         result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode());
         return result;

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

@@ -457,6 +457,146 @@ public class UpmsSystemExample implements Serializable {
             return (Criteria) this;
         }
 
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNull() {
+            addCriterion("description is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIsNotNull() {
+            addCriterion("description is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionEqualTo(String value) {
+            addCriterion("description =", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotEqualTo(String value) {
+            addCriterion("description <>", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThan(String value) {
+            addCriterion("description >", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("description >=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThan(String value) {
+            addCriterion("description <", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLessThanOrEqualTo(String value) {
+            addCriterion("description <=", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionLike(String value) {
+            addCriterion("description like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotLike(String value) {
+            addCriterion("description not like", value, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionIn(List<String> values) {
+            addCriterion("description in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotIn(List<String> values) {
+            addCriterion("description not in", values, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionBetween(String value1, String value2) {
+            addCriterion("description between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescriptionNotBetween(String value1, String value2) {
+            addCriterion("description not between", value1, value2, "description");
+            return (Criteria) this;
+        }
+
         public Criteria andCtimeIsNull() {
             addCriterion("ctime is null");
             return (Criteria) this;

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است