fix template model

pom.xml

@@ -8,9 +8,8 @@
     <artifactId>ruoyi</artifactId>
     <version>3.1.0</version>
 
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <name>lineage</name>
+    <description>传承云管理系统</description>
     
     <properties>
         <ruoyi.version>3.1.0</ruoyi.version>

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -4,6 +4,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
+import java.util.Date;
+
 /**
  * 启动程序
  * 
@@ -16,15 +18,6 @@ public class RuoYiApplication
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
+        System.out.println("===========启动成功==========\n"+String.format("%tc%n",new Date()));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -113,9 +113,9 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：传承云管理系统_接口文档")
                 // 描述
-                .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+                .description("")
                 // 作者信息
                 .contact(new Contact(ruoyiConfig.getName(), null, null))
                 // 版本

ruoyi-system/src/main/java/com/ruoyi/system/domain/TPersonalPage.java

@@ -41,10 +41,6 @@ public class TPersonalPage extends BaseEntity
     @Excel(name = "头像url")
     private String avatar;
 
-    /** 生平描述 */
-    @Excel(name = "生平描述")
-    private String lifeDescribe;
-
     /** 个人页模板id */
     @Excel(name = "个人页模板id")
     private Long templateId;
@@ -111,15 +107,6 @@ public class TPersonalPage extends BaseEntity
     {
         return avatar;
     }
-    public void setLifeDescribe(String lifeDescribe)
-    {
-        this.lifeDescribe = lifeDescribe;
-    }
-
-    public String getLifeDescribe()
-    {
-        return lifeDescribe;
-    }
     public void setTemplateId(Long templateId)
     {
         this.templateId = templateId;
@@ -157,7 +144,6 @@ public class TPersonalPage extends BaseEntity
                 .append("stakeholder", getStakeholder())
                 .append("stakeholderBirthday", getStakeholderBirthday())
                 .append("avatar", getAvatar())
-                .append("lifeDescribe", getLifeDescribe())
                 .append("templateId", getTemplateId())
                 .append("content", getContent())
                 .append("enable", getEnable())

ruoyi-system/src/main/java/com/ruoyi/system/domain/TTemplatePage.java

@@ -1,7 +1,5 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -24,27 +22,10 @@ public class TTemplatePage extends BaseEntity
     @Excel(name = "模板名称")
     private String title;
 
-    /** 模板内容 富文本s */
-    @Excel(name = "模板内容 富文本s")
-    private String content;
-
     /** 模板路由 */
     @Excel(name = "模板路由")
     private String route;
 
-    /** 客户姓名 */
-    @Excel(name = "客户姓名")
-    private String customer;
-
-    /** 干系人姓名 */
-    @Excel(name = "干系人姓名")
-    private String stakeholder;
-
-    /** 干系人生日 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "干系人生日", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date stakeholderBirthday;
-
     /** 启用  0正常，1停用 */
     @Excel(name = "启用  0正常，1停用")
     private String enable;
@@ -53,70 +34,33 @@ public class TTemplatePage extends BaseEntity
     {
         this.id = id;
     }
-
     public Long getId()
     {
         return id;
     }
+
     public void setTitle(String title)
     {
         this.title = title;
     }
-
     public String getTitle()
     {
         return title;
     }
-    public void setContent(String content)
-    {
-        this.content = content;
-    }
 
-    public String getContent()
-    {
-        return content;
-    }
     public void setRoute(String route)
     {
         this.route = route;
     }
-
     public String getRoute()
     {
         return route;
     }
-    public void setCustomer(String customer)
-    {
-        this.customer = customer;
-    }
 
-    public String getCustomer()
-    {
-        return customer;
-    }
-    public void setStakeholder(String stakeholder)
-    {
-        this.stakeholder = stakeholder;
-    }
-
-    public String getStakeholder()
-    {
-        return stakeholder;
-    }
-    public void setStakeholderBirthday(Date stakeholderBirthday)
-    {
-        this.stakeholderBirthday = stakeholderBirthday;
-    }
-
-    public Date getStakeholderBirthday()
-    {
-        return stakeholderBirthday;
-    }
     public void setEnable(String enable)
     {
         this.enable = enable;
     }
-
     public String getEnable()
     {
         return enable;
@@ -127,11 +71,7 @@ public class TTemplatePage extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("title", getTitle())
-                .append("content", getContent())
                 .append("route", getRoute())
-                .append("customer", getCustomer())
-                .append("stakeholder", getStakeholder())
-                .append("stakeholderBirthday", getStakeholderBirthday())
                 .append("enable", getEnable())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())

ruoyi-system/src/main/resources/mapper/system/TPersonalPageMapper.xml

@@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stakeholder"    column="stakeholder"    />
         <result property="stakeholderBirthday"    column="stakeholder_birthday"    />
         <result property="avatar"    column="avatar"    />
-        <result property="lifeDescribe"    column="life_describe"    />
         <result property="templateId"    column="template_id"    />
         <result property="content"    column="content"    />
         <result property="enable"    column="enable"    />
@@ -23,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPersonalPageVo">
-        select id, customer_id, customer, stakeholder, stakeholder_birthday, avatar, life_describe, template_id, content, enable, create_by, create_time, update_by, update_time, remark from t_personal_page
+        select id, customer_id, customer, stakeholder, stakeholder_birthday, avatar, template_id, content, enable, create_by, create_time, update_by, update_time, remark from t_personal_page
     </sql>
 
     <select id="selectTPersonalPageList" parameterType="TPersonalPage" resultMap="TPersonalPageResult">
@@ -34,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeholder != null  and stakeholder != ''"> and stakeholder = #{stakeholder}</if>
             <if test="stakeholderBirthday != null "> and stakeholder_birthday = #{stakeholderBirthday}</if>
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
-            <if test="lifeDescribe != null  and lifeDescribe != ''"> and life_describe = #{lifeDescribe}</if>
             <if test="templateId != null "> and template_id = #{templateId}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="enable != null "> and enable = #{enable}</if>
@@ -54,7 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeholder != null">stakeholder,</if>
             <if test="stakeholderBirthday != null">stakeholder_birthday,</if>
             <if test="avatar != null">avatar,</if>
-            <if test="lifeDescribe != null">life_describe,</if>
             <if test="templateId != null">template_id,</if>
             <if test="content != null">content,</if>
             <if test="enable != null">enable,</if>
@@ -70,7 +67,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeholder != null">#{stakeholder},</if>
             <if test="stakeholderBirthday != null">#{stakeholderBirthday},</if>
             <if test="avatar != null">#{avatar},</if>
-            <if test="lifeDescribe != null">#{lifeDescribe},</if>
             <if test="templateId != null">#{templateId},</if>
             <if test="content != null">#{content},</if>
             <if test="enable != null">#{enable},</if>
@@ -90,7 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stakeholder != null">stakeholder = #{stakeholder},</if>
             <if test="stakeholderBirthday != null">stakeholder_birthday = #{stakeholderBirthday},</if>
             <if test="avatar != null">avatar = #{avatar},</if>
-            <if test="lifeDescribe != null">life_describe = #{lifeDescribe},</if>
             <if test="templateId != null">template_id = #{templateId},</if>
             <if test="content != null">content = #{content},</if>
             <if test="enable != null">enable = #{enable},</if>

ruoyi-system/src/main/resources/mapper/system/TTemplatePageMapper.xml

@@ -7,11 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TTemplatePage" id="TTemplatePageResult">
         <result property="id"    column="id"    />
         <result property="title"    column="title"    />
-        <result property="content"    column="content"    />
         <result property="route"    column="route"    />
-        <result property="customer"    column="customer"    />
-        <result property="stakeholder"    column="stakeholder"    />
-        <result property="stakeholderBirthday"    column="stakeholder_birthday"    />
         <result property="enable"    column="enable"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -21,18 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTTemplatePageVo">
-        select id, title, content, route, customer, stakeholder, stakeholder_birthday, enable, create_by, create_time, update_by, update_time, remark from t_template_page
+        select id, title, route, enable, create_by, create_time, update_by, update_time, remark from t_template_page
     </sql>
 
     <select id="selectTTemplatePageList" parameterType="TTemplatePage" resultMap="TTemplatePageResult">
         <include refid="selectTTemplatePageVo"/>
-        <where>  
+        <where>
             <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="route != null  and route != ''"> and route = #{route}</if>
-            <if test="customer != null  and customer != ''"> and customer = #{customer}</if>
-            <if test="stakeholder != null  and stakeholder != ''"> and stakeholder = #{stakeholder}</if>
-            <if test="stakeholderBirthday != null "> and stakeholder_birthday = #{stakeholderBirthday}</if>
             <if test="enable != null "> and enable = #{enable}</if>
         </where>
     </select>
@@ -46,11 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_template_page
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null">title,</if>
-            <if test="content != null">content,</if>
             <if test="route != null">route,</if>
-            <if test="customer != null">customer,</if>
-            <if test="stakeholder != null">stakeholder,</if>
-            <if test="stakeholderBirthday != null">stakeholder_birthday,</if>
             <if test="enable != null">enable,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -60,11 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
-            <if test="content != null">#{content},</if>
             <if test="route != null">#{route},</if>
-            <if test="customer != null">#{customer},</if>
-            <if test="stakeholder != null">#{stakeholder},</if>
-            <if test="stakeholderBirthday != null">#{stakeholderBirthday},</if>
             <if test="enable != null">#{enable},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -78,11 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_template_page
         <trim prefix="SET" suffixOverrides=",">
             <if test="title != null">title = #{title},</if>
-            <if test="content != null">content = #{content},</if>
             <if test="route != null">route = #{route},</if>
-            <if test="customer != null">customer = #{customer},</if>
-            <if test="stakeholder != null">stakeholder = #{stakeholder},</if>
-            <if test="stakeholderBirthday != null">stakeholder_birthday = #{stakeholderBirthday},</if>
             <if test="enable != null">enable = #{enable},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

sql/t_personal_img.sql

@@ -1,18 +1,3 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local
- Source Server Type    : MariaDB
- Source Server Version : 100209
- Source Host           : localhost:3306
- Source Schema         : ruoyi
-
- Target Server Type    : MariaDB
- Target Server Version : 100209
- File Encoding         : 65001
-
- Date: 02/09/2020 02:54:41
-*/
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

sql/t_personal_page.sql

@@ -1,18 +1,3 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local
- Source Server Type    : MariaDB
- Source Server Version : 100209
- Source Host           : localhost:3306
- Source Schema         : ruoyi
-
- Target Server Type    : MariaDB
- Target Server Version : 100209
- File Encoding         : 65001
-
- Date: 02/09/2020 02:54:49
-*/
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
@@ -28,7 +13,6 @@ CREATE TABLE `t_personal_page`  (
   `stakeholder` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '干系人姓名',
   `stakeholder_birthday` datetime(0) NULL DEFAULT NULL COMMENT '干系人生日',
   `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '头像url',
-  `life_describe` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '生平描述',
   `template_id` int(11) NULL DEFAULT NULL COMMENT '个人页模板id',
   `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '个人页内容 富文本',
   `enable` int(1) NULL DEFAULT NULL COMMENT '启用  0正常，1停用',

sql/t_template_page.sql

@@ -1,18 +1,3 @@
-/*
- Navicat Premium Data Transfer
-
- Source Server         : local
- Source Server Type    : MariaDB
- Source Server Version : 100209
- Source Host           : localhost:3306
- Source Schema         : ruoyi
-
- Target Server Type    : MariaDB
- Target Server Version : 100209
- File Encoding         : 65001
-
- Date: 02/09/2020 02:54:56
-*/
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
@@ -24,11 +9,7 @@ DROP TABLE IF EXISTS `t_template_page`;
 CREATE TABLE `t_template_page`  (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键id',
   `title` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板名称',
-  `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '模板内容 富文本s',
   `route` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模板路由',
-  `customer` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户姓名',
-  `stakeholder` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '干系人姓名',
-  `stakeholder_birthday` datetime(0) NULL DEFAULT NULL COMMENT '干系人生日',
   `enable` int(1) NULL DEFAULT NULL COMMENT '启用  0正常，1停用',
   `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
   `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
@@ -36,11 +17,6 @@ CREATE TABLE `t_template_page`  (
   `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '个人页模板' ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Records of t_template_page
--- ----------------------------
-INSERT INTO `t_template_page` VALUES (2, '121212', '<p><strong style=\"color: rgb(230, 0, 0);\">121212121212</strong></p>', NULL, '1212', '12121', '2020-08-03 00:00:00', 0, '', '2020-08-30 23:44:07', 'admin', NULL, NULL);
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '个人页模板' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;