wiki接口和页面

This commit is contained in:
暮光:城中城
2019-02-28 22:38:56 +08:00
parent b14e2c5989
commit ed8242535d
40 changed files with 5636 additions and 145 deletions

View File

@@ -12,7 +12,7 @@ import java.util.Date;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-27
* @since 2019-02-24
*/
public class WikiPage implements Serializable {
@@ -47,7 +47,12 @@ public class WikiPage implements Serializable {
/**
* 创建人ID
*/
private Long createUid;
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
@@ -57,7 +62,12 @@ public class WikiPage implements Serializable {
/**
* 修改人ID
*/
private Long updateUid;
private Long updateUserId;
/**
* 修改人名字
*/
private String updateUserName;
/**
* 修改时间
@@ -104,12 +114,19 @@ public class WikiPage implements Serializable {
public void setNodeType(Integer nodeType) {
this.nodeType = nodeType;
}
public Long getCreateUid() {
return createUid;
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUid(Long createUid) {
this.createUid = createUid;
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
@@ -118,12 +135,19 @@ public class WikiPage implements Serializable {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getUpdateUid() {
return updateUid;
public Long getUpdateUserId() {
return updateUserId;
}
public void setUpdateUid(Long updateUid) {
this.updateUid = updateUid;
public void setUpdateUserId(Long updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
public Date getUpdateTime() {
return updateTime;
@@ -148,9 +172,11 @@ public class WikiPage implements Serializable {
", name=" + name +
", parentId=" + parentId +
", nodeType=" + nodeType +
", createUid=" + createUid +
", createUserId=" + createUserId +
", createUserName=" + createUserName +
", createTime=" + createTime +
", updateUid=" + updateUid +
", updateUserId=" + updateUserId +
", updateUserName=" + updateUserName +
", updateTime=" + updateTime +
", delFlag=" + delFlag +
"}";

View File

@@ -7,11 +7,11 @@ import java.io.Serializable;
/**
* <p>
*
*
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public class WikiPageComment implements Serializable {
@@ -41,7 +41,12 @@ public class WikiPageComment implements Serializable {
/**
* 创建人ID
*/
private Long createUid;
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
@@ -81,12 +86,19 @@ public class WikiPageComment implements Serializable {
public void setContent(String content) {
this.content = content;
}
public Long getCreateUid() {
return createUid;
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUid(Long createUid) {
this.createUid = createUid;
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
@@ -110,7 +122,8 @@ public class WikiPageComment implements Serializable {
", pageId=" + pageId +
", parentId=" + parentId +
", content=" + content +
", createUid=" + createUid +
", createUserId=" + createUserId +
", createUserName=" + createUserName +
", createTime=" + createTime +
", delFlag=" + delFlag +
"}";

View File

@@ -7,11 +7,11 @@ import java.io.Serializable;
/**
* <p>
*
*
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public class WikiPageContent implements Serializable {
@@ -36,7 +36,12 @@ public class WikiPageContent implements Serializable {
/**
* 创建人ID
*/
private Long createUid;
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
@@ -46,7 +51,12 @@ public class WikiPageContent implements Serializable {
/**
* 修改人ID
*/
private Long updateUid;
private Long updateUserId;
/**
* 修改人名字
*/
private String updateUserName;
/**
* 修改时间
@@ -74,12 +84,19 @@ public class WikiPageContent implements Serializable {
public void setContent(String content) {
this.content = content;
}
public Long getCreateUid() {
return createUid;
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUid(Long createUid) {
this.createUid = createUid;
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
@@ -88,12 +105,19 @@ public class WikiPageContent implements Serializable {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getUpdateUid() {
return updateUid;
public Long getUpdateUserId() {
return updateUserId;
}
public void setUpdateUid(Long updateUid) {
this.updateUid = updateUid;
public void setUpdateUserId(Long updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
public Date getUpdateTime() {
return updateTime;
@@ -109,9 +133,11 @@ public class WikiPageContent implements Serializable {
"id=" + id +
", pageId=" + pageId +
", content=" + content +
", createUid=" + createUid +
", createUserId=" + createUserId +
", createUserName=" + createUserName +
", createTime=" + createTime +
", updateUid=" + updateUid +
", updateUserId=" + updateUserId +
", updateUserName=" + updateUserName +
", updateTime=" + updateTime +
"}";
}

View File

@@ -12,7 +12,7 @@ import java.util.Date;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public class WikiPageFile implements Serializable {
@@ -29,6 +29,11 @@ public class WikiPageFile implements Serializable {
*/
private Long pageId;
/**
* 文件名
*/
private String fileName;
/**
* 文件URL
*/
@@ -37,7 +42,12 @@ public class WikiPageFile implements Serializable {
/**
* 创建人ID
*/
private Long createUid;
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
@@ -47,7 +57,12 @@ public class WikiPageFile implements Serializable {
/**
* 修改人ID
*/
private Long updateUid;
private Long updateUserId;
/**
* 修改人名字
*/
private String updateUserName;
/**
* 修改时间
@@ -73,6 +88,13 @@ public class WikiPageFile implements Serializable {
public void setPageId(Long pageId) {
this.pageId = pageId;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getFileUrl() {
return fileUrl;
}
@@ -80,12 +102,19 @@ public class WikiPageFile implements Serializable {
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
public Long getCreateUid() {
return createUid;
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUid(Long createUid) {
this.createUid = createUid;
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
@@ -94,12 +123,19 @@ public class WikiPageFile implements Serializable {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getUpdateUid() {
return updateUid;
public Long getUpdateUserId() {
return updateUserId;
}
public void setUpdateUid(Long updateUid) {
this.updateUid = updateUid;
public void setUpdateUserId(Long updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
public Date getUpdateTime() {
return updateTime;
@@ -121,10 +157,13 @@ public class WikiPageFile implements Serializable {
return "WikiPageFile{" +
"id=" + id +
", pageId=" + pageId +
", fileName=" + fileName +
", fileUrl=" + fileUrl +
", createUid=" + createUid +
", createUserId=" + createUserId +
", createUserName=" + createUserName +
", createTime=" + createTime +
", updateUid=" + updateUid +
", updateUserId=" + updateUserId +
", updateUserName=" + updateUserName +
", updateTime=" + updateTime +
", delFlag=" + delFlag +
"}";

View File

@@ -1,10 +1,9 @@
package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
/**
* <p>
@@ -12,7 +11,7 @@ import java.util.Date;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public class WikiPageZan implements Serializable {
@@ -37,7 +36,12 @@ public class WikiPageZan implements Serializable {
/**
* 创建人ID
*/
private Long createUid;
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
@@ -65,12 +69,19 @@ public class WikiPageZan implements Serializable {
public void setCommentId(Long commentId) {
this.commentId = commentId;
}
public Long getCreateUid() {
return createUid;
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUid(Long createUid) {
this.createUid = createUid;
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
@@ -86,7 +97,8 @@ public class WikiPageZan implements Serializable {
"id=" + id +
", pageId=" + pageId +
", commentId=" + commentId +
", createUid=" + createUid +
", createUserId=" + createUserId +
", createUserName=" + createUserName +
", createTime=" + createTime +
"}";
}

View File

@@ -1,10 +1,9 @@
package com.zyplayer.doc.data.repository.manage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
/**
* <p>
@@ -12,7 +11,7 @@ import java.util.Date;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public class WikiSpace implements Serializable {
@@ -42,7 +41,12 @@ public class WikiSpace implements Serializable {
/**
* 创建人ID
*/
private Long createUid;
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
@@ -77,12 +81,19 @@ public class WikiSpace implements Serializable {
public void setExplain(String explain) {
this.explain = explain;
}
public Long getCreateUid() {
return createUid;
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUid(Long createUid) {
this.createUid = createUid;
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
@@ -99,7 +110,8 @@ public class WikiSpace implements Serializable {
", name=" + name +
", type=" + type +
", explain=" + explain +
", createUid=" + createUid +
", createUserId=" + createUserId +
", createUserName=" + createUserName +
", createTime=" + createTime +
"}";
}

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageCommentMapper extends BaseMapper<WikiPageComment> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageContentMapper extends BaseMapper<WikiPageContent> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageFileMapper extends BaseMapper<WikiPageFile> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-27
* @since 2019-02-24
*/
public interface WikiPageMapper extends BaseMapper<WikiPage> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageZanMapper extends BaseMapper<WikiPageZan> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiSpaceMapper extends BaseMapper<WikiSpace> {

View File

@@ -18,8 +18,8 @@ public class CodeGenerator {
final String moduleName = "manage";
// final String[] tableName = { "zyplayer_storage", "auth_info", "user_auth", "user_info" };
// final String[] tableName = { "wiki_space", "wiki_page", "wiki_page_content", "wiki_page_file", "wiki_page_comment", "wiki_page_zan" };
final String[] tableName = { "wiki_page" };
final String[] tableName = { "wiki_space", "wiki_page", "wiki_page_content", "wiki_page_file", "wiki_page_comment", "wiki_page_zan" };
// final String[] tableName = { "wiki_page" };
// 代码生成器
AutoGenerator mpg = new AutoGenerator();

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageCommentService extends IService<WikiPageComment> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageContentService extends IService<WikiPageContent> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageFileService extends IService<WikiPageFile> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-27
* @since 2019-02-24
*/
public interface WikiPageService extends IService<WikiPage> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiPageZanService extends IService<WikiPageZan> {

View File

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
public interface WikiSpaceService extends IService<WikiSpace> {

View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
@Service
public class WikiPageCommentServiceImpl extends ServiceImpl<WikiPageCommentMapper, WikiPageComment> implements WikiPageCommentService {

View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
@Service
public class WikiPageContentServiceImpl extends ServiceImpl<WikiPageContentMapper, WikiPageContent> implements WikiPageContentService {

View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
@Service
public class WikiPageFileServiceImpl extends ServiceImpl<WikiPageFileMapper, WikiPageFile> implements WikiPageFileService {

View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-27
* @since 2019-02-24
*/
@Service
public class WikiPageServiceImpl extends ServiceImpl<WikiPageMapper, WikiPage> implements WikiPageService {

View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
@Service
public class WikiPageZanServiceImpl extends ServiceImpl<WikiPageZanMapper, WikiPageZan> implements WikiPageZanService {

View File

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author 暮光:城中城
* @since 2019-02-26
* @since 2019-02-24
*/
@Service
public class WikiSpaceServiceImpl extends ServiceImpl<WikiSpaceMapper, WikiSpace> implements WikiSpaceService {

View File

@@ -11,7 +11,7 @@
Target Server Version : 50724
File Encoding : 65001
Date: 26/02/2019 20:41:51
Date: 24/02/2019 18:13:04
*/
SET NAMES utf8mb4;
@@ -70,6 +70,7 @@ INSERT INTO `user_auth` VALUES (24, 1, 1, 1, NULL, 0, '2018-12-16 21:41:01', NUL
INSERT INTO `user_auth` VALUES (25, 1, 2, 1, NULL, 0, '2018-12-16 21:41:01', NULL);
INSERT INTO `user_auth` VALUES (26, 1, 3, 1, NULL, 0, '2018-12-16 21:41:01', NULL);
INSERT INTO `user_auth` VALUES (27, 1, 4, 1, NULL, 0, '2018-12-16 21:41:01', NULL);
-- ----------------------------
-- Table structure for user_info
-- ----------------------------
@@ -93,8 +94,9 @@ CREATE TABLE `user_info` (
-- Records of user_info
-- ----------------------------
INSERT INTO `user_info` VALUES (1, 'zyplayer', 'e10adc3949ba59abbe56e057f20f883e', '暮光:城中城', '806783409@qq.com', NULL, 0, '2018-12-01 11:37:39', NULL, '2018-12-15 20:32:08');
INSERT INTO `user_info` VALUES (2, '1', NULL, '1111', NULL, NULL, 0, '2018-12-15 20:16:10', 1, '2018-12-15 20:19:50');
INSERT INTO `user_info` VALUES (2, '1', 'e10adc3949ba59abbe56e057f20f883e', '1111', NULL, NULL, 0, '2018-12-15 20:16:10', 1, '2018-12-15 20:19:50');
INSERT INTO `user_info` VALUES (3, '2', NULL, '11', '11', NULL, 0, '2018-12-15 20:21:24', 1, NULL);
-- ----------------------------
-- Table structure for wiki_page
-- ----------------------------
@@ -102,15 +104,35 @@ DROP TABLE IF EXISTS `wiki_page`;
CREATE TABLE `wiki_page` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`space_id` bigint(20) NULL DEFAULT NULL COMMENT '空间ID',
`name` varchar(50) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '名字',
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名字',
`parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父ID',
`create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`node_type` tinyint(4) NULL DEFAULT 0 COMMENT '节点类型 0=有子节点 1=终节点',
`create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_name` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建人名字',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_uid` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
`update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
`update_user_name` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '修改人名字',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of wiki_page
-- ----------------------------
INSERT INTO `wiki_page` VALUES (1, 1, '规范', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (2, 1, '流程', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (3, 1, '分享', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (4, 1, '精品收藏', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (5, 1, '数据库规范', 1, 1, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (6, 1, 'JAVA开发规范', 1, 1, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (7, 1, '测试1', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (8, 1, '测试2', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (9, 1, '测试3', 7, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (10, 1, '测试4', 7, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (11, 1, '测试5', 9, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (12, 1, '测试6', 7, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
INSERT INTO `wiki_page` VALUES (14, 1, '测试7', NULL, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0);
-- ----------------------------
-- Table structure for wiki_page_comment
@@ -120,8 +142,9 @@ CREATE TABLE `wiki_page_comment` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
`parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父评论ID',
`content` varchar(512) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '评论内容',
`create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`content` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '评论内容',
`create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_name` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建人名字',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除',
PRIMARY KEY (`id`) USING BTREE
@@ -134,14 +157,28 @@ DROP TABLE IF EXISTS `wiki_page_content`;
CREATE TABLE `wiki_page_content` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
`content` mediumtext CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL COMMENT '内容',
`create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`content` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '内容',
`create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_name` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建人名字',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_uid` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
`update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
`update_user_name` varchar(0) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '修改人名字',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `uk_page_id`(`page_id`) USING BTREE COMMENT '页面ID'
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of wiki_page_content
-- ----------------------------
INSERT INTO `wiki_page_content` VALUES (1, 7, '<p>测试1测试1测试1测试1测试1</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (2, 8, '<p>测试2测试2测试2测试2</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (3, 9, '<p>测试3测试3测试3测试3测试3</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (4, 10, '<p>测试4测试4测试4测试4测试4</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (5, 11, '<p>测试5测试5测试5测试5</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (6, 12, '<p>测试6测试6测试6测试6测试6</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (7, 13, '<p>欢迎使用 wangEditor 富文本编辑器</p><p>测试7</p>', 1, NULL, '2019-02-24 17:51:56', NULL, NULL, '2019-02-24 17:51:56');
INSERT INTO `wiki_page_content` VALUES (8, 14, '<p>测试7 测试7测试7测试7&nbsp;</p>', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56');
-- ----------------------------
-- Table structure for wiki_page_file
@@ -150,14 +187,22 @@ DROP TABLE IF EXISTS `wiki_page_file`;
CREATE TABLE `wiki_page_file` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
`file_url` varchar(50) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '文件URL',
`create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`file_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件',
`file_url` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件URL',
`create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_uid` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
`update_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID',
`update_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人名字',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',
`del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of wiki_page_file
-- ----------------------------
INSERT INTO `wiki_page_file` VALUES (1, 7, '开发规范.doc', 'http://www.baidu.com', 1, '暮光:城中城', '2019-02-24 17:51:56', NULL, NULL, NULL, 0);
-- ----------------------------
-- Table structure for wiki_page_zan
@@ -167,7 +212,8 @@ CREATE TABLE `wiki_page_zan` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`page_id` bigint(20) NULL DEFAULT NULL COMMENT '页面ID',
`comment_id` bigint(20) NULL DEFAULT NULL COMMENT '评论ID',
`create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_name` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建人名字',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
@@ -178,13 +224,19 @@ CREATE TABLE `wiki_page_zan` (
DROP TABLE IF EXISTS `wiki_space`;
CREATE TABLE `wiki_space` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`name` varchar(50) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '空间名',
`name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '空间名',
`type` tinyint(4) NULL DEFAULT 1 COMMENT '空间类型 1=公司 2=个人 3=私人',
`explain` varchar(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '描述',
`create_uid` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`explain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述',
`create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID',
`create_user_name` varchar(20) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL COMMENT '创建人名字',
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of wiki_space
-- ----------------------------
INSERT INTO `wiki_space` VALUES (1, '研发中心', 1, NULL, 1, NULL, '2019-02-24 17:51:56');
-- ----------------------------
-- Table structure for zyplayer_storage
@@ -193,11 +245,14 @@ DROP TABLE IF EXISTS `zyplayer_storage`;
CREATE TABLE `zyplayer_storage` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID',
`doc_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数名字',
`doc_value` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '参数值',
`doc_value` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数值',
`creation_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE,
UNIQUE INDEX `key`(`doc_key`) USING BTREE COMMENT 'key唯一索引'
) ENGINE = InnoDB AUTO_INCREMENT = 43 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '存储网页上相关的数据' ROW_FORMAT = Compact;
-- ----------------------------
-- Records of zyplayer_storage
-- ----------------------------
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -0,0 +1,54 @@
package com.zyplayer.doc.test;
/**
* 生成6位字符的ID
*
* @author 暮光:城中城
* @since 2019年2月17日
*/
public class CreateIdTest {
private static String convertStr = "";
private static String[] convertArr = {"e", "6", "1", "5", "r", "Q", "W", "j", "Y", "d", "D", "m", "a", "p", "B", "C", "l", "8", "E", "t", "h", "s", "S", "u", "M", "R", "z", "g", "H", "X", "y", "L", "T", "7", "K", "I", "O", "4", "k", "o", "b", "P", "i", "U", "n", "v", "f", "3", "Z", "9", "c", "G", "w", "A", "N", "0", "x", "q", "J", "V", "F", "2"};
// 可到这个网站把顺序打乱就成一个新的了http://www.fuhaoku.com/tool/daluan.html
public static void main(String[] args) {
long baseNum = 916132832L + 100000000;
convertStr = String.join("", convertArr);
// 1 6位数
String to62 = convert10To62(1L);
System.out.println((baseNum + 1L) + "" + to62);
System.out.println(to62 + "" + convert62To10(to62));
// 555亿 6位数
to62 = convert10To62(55555555555L);
System.out.println((baseNum + 55555555555L) + "" + to62);
System.out.println(to62 + "" + convert62To10(to62));
// 5555亿 7位数
to62 = convert10To62(555555555555L);
System.out.println((baseNum + 555555555555L) + "" + to62);
System.out.println(to62 + "" + convert62To10(to62));
}
private static String convert10To62(Long num) {
long base = 916132832L + 100000000 + num;
StringBuilder sb = new StringBuilder();
while (base != 0) {
sb.append(convertArr[(int) (base % 62)]);
base = base / 62;
}
return sb.reverse().toString();
}
private static long convert62To10(String number) {
char[] charArr = number.toCharArray();
int len = charArr.length;
long result = 0;
long base = 1;
for (int i = len - 1; i >= 0; i--) {
int index = convertStr.indexOf(charArr[i]);
result += index * base;
base *= 62;
}
return result;
}
}

View File

@@ -48,7 +48,7 @@ public class WikiPageCommentController {
} else {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
pageComment.setCreateTime(new Date());
pageComment.setCreateUid(currentUser.getUserId());
pageComment.setCreateUserId(currentUser.getUserId());
wikiPageCommentService.save(pageComment);
}
return DocResponseJson.ok();

View File

@@ -7,8 +7,11 @@ import com.zyplayer.doc.data.config.security.DocUserDetails;
import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import com.zyplayer.doc.data.service.manage.WikiPageContentService;
import com.zyplayer.doc.data.service.manage.WikiPageFileService;
import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +37,8 @@ public class WikiPageController {
WikiPageService wikiPageService;
@Resource
WikiPageContentService wikiPageContentService;
@Resource
WikiPageFileService wikiPageFileService;
@PostMapping("/list")
public ResponseJson<List<WikiPage>> list(WikiPage wikiPage) {
@@ -47,6 +52,26 @@ public class WikiPageController {
return DocResponseJson.ok(authList);
}
@PostMapping("/detail")
public ResponseJson<WikiPageContentVo> detail(WikiPage wikiPage) {
WikiPage wikiPageSel = wikiPageService.getById(wikiPage.getId());
UpdateWrapper<WikiPageContent> wrapper = new UpdateWrapper<>();
wrapper.eq("page_id", wikiPage.getId());
WikiPageContent pageContent = wikiPageContentService.getOne(wrapper);
UpdateWrapper<WikiPageFile> wrapperFile = new UpdateWrapper<>();
wrapperFile.eq("page_id", wikiPage.getId());
wrapper.eq("del_flag", 0);
List<WikiPageFile> pageFiles = wikiPageFileService.list(wrapperFile);
WikiPageContentVo vo = new WikiPageContentVo();
vo.setWikiPage(wikiPageSel);
vo.setPageContent(pageContent);
vo.setFileList(pageFiles);
return DocResponseJson.ok(vo);
}
@PostMapping("/update")
public ResponseJson<Object> update(WikiPage wikiPage, String content) {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
@@ -56,24 +81,25 @@ public class WikiPageController {
Long id = wikiPage.getId();
if (id != null && id > 0) {
wikiPage.setUpdateTime(new Date());
wikiPage.setUpdateUid(currentUser.getUserId());
wikiPage.setUpdateUserId(currentUser.getUserId());
wikiPageService.updateById(wikiPage);
// 详情
pageContent.setUpdateTime(new Date());
pageContent.setUpdateUid(currentUser.getUserId());
pageContent.setUpdateUserId(currentUser.getUserId());
UpdateWrapper<WikiPageContent> wrapper = new UpdateWrapper<>();
wrapper.eq("page_id", id);
wikiPageContentService.update(pageContent, wrapper);
} else {
wikiPage.setCreateTime(new Date());
wikiPage.setCreateUid(currentUser.getUserId());
wikiPage.setCreateUserId(currentUser.getUserId());
wikiPageService.save(wikiPage);
// 详情
pageContent.setPageId(wikiPage.getId());
pageContent.setCreateTime(new Date());
pageContent.setCreateUid(currentUser.getUserId());
pageContent.setCreateUserId(currentUser.getUserId());
wikiPageContentService.save(pageContent);
}
return DocResponseJson.ok();
return DocResponseJson.ok(wikiPage);
}
}

View File

@@ -49,7 +49,7 @@ public class WikiPageFileController {
} else {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
wikiPageFile.setCreateTime(new Date());
wikiPageFile.setCreateUid(currentUser.getUserId());
wikiPageFile.setCreateUserId(currentUser.getUserId());
wikiPageFileService.save(wikiPageFile);
}
return DocResponseJson.ok();

View File

@@ -52,7 +52,7 @@ public class WikiPageZanController {
return DocResponseJson.warn("您已经赞过了哦~");
}
wikiPageZan.setCreateTime(new Date());
wikiPageZan.setCreateUid(currentUser.getUserId());
wikiPageZan.setCreateUserId(currentUser.getUserId());
wikiPageZanService.save(wikiPageZan);
return DocResponseJson.ok();
}

View File

@@ -40,7 +40,7 @@ public class WikiSpaceController {
wrapper.in("type", 1, 2);
} else if(wikiSpace.getType() == 1 || wikiSpace.getType() == 2) {
wrapper.eq(wikiSpace.getType() != null, "type", wikiSpace.getType());
wrapper.eq(Objects.equals(wikiSpace.getType(), 2), "create_uid", wikiSpace.getCreateUid());
wrapper.eq(Objects.equals(wikiSpace.getType(), 2), "create_uid", wikiSpace.getCreateUserId());
} else if(wikiSpace.getType() == 3) {
wrapper.eq("create_uid", currentUser.getUserId());
}
@@ -56,7 +56,7 @@ public class WikiSpaceController {
} else {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
wikiSpace.setCreateTime(new Date());
wikiSpace.setCreateUid(currentUser.getUserId());
wikiSpace.setCreateUserId(currentUser.getUserId());
wikiSpaceService.save(wikiSpace);
}
return DocResponseJson.ok();

View File

@@ -0,0 +1,37 @@
package com.zyplayer.doc.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageFile;
import java.util.List;
public class WikiPageContentVo {
private WikiPage wikiPage;
private WikiPageContent pageContent;
private List<WikiPageFile> fileList;
public WikiPage getWikiPage() {
return wikiPage;
}
public void setWikiPage(WikiPage wikiPage) {
this.wikiPage = wikiPage;
}
public WikiPageContent getPageContent() {
return pageContent;
}
public void setPageContent(WikiPageContent pageContent) {
this.pageContent = pageContent;
}
public List<WikiPageFile> getFileList() {
return fileList;
}
public void setFileList(List<WikiPageFile> fileList) {
this.fileList = fileList;
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long