From 840f6b457ba3379752816bdbf9609e2d5f5c8711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Fri, 8 Mar 2019 22:40:50 +0800 Subject: [PATCH] =?UTF-8?q?wiki=E7=A9=BA=E9=97=B4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=94=AF=E6=8C=81=E6=8B=96=E5=8A=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/manage/entity/WikiSpace.java | 22 ++++- .../manage/mapper/WikiSpaceMapper.java | 2 +- .../data/service/manage/WikiSpaceService.java | 2 +- .../manage/impl/WikiSpaceServiceImpl.java | 2 +- .../sql/zyplayer_doc_manage.1.0.1.sql | 62 ++++++++----- .../wiki/controller/WikiPageController.java | 2 +- .../wiki/controller/WikiSpaceController.java | 3 +- .../src/main/resources/doc-wiki.html | 93 ++++++++++++++++--- 8 files changed, 142 insertions(+), 46 deletions(-) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java index bc0579d4..d63eeb13 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java @@ -1,18 +1,17 @@ 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; /** *

- * + * *

* * @author 暮光：城中城 - * @since 2019-03-07 + * @since 2019-03-08 */ public class WikiSpace implements Serializable { @@ -54,6 +53,11 @@ public class WikiSpace implements Serializable { */ private Date createTime; + /** + * 删除标记 0=正常 1=已删除 + */ + private Integer delFlag; + public Long getId() { return id; } @@ -103,6 +107,13 @@ public class WikiSpace implements Serializable { public void setCreateTime(Date createTime) { this.createTime = createTime; } + public Integer getDelFlag() { + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + this.delFlag = delFlag; + } @Override public String toString() { @@ -114,6 +125,7 @@ public class WikiSpace implements Serializable { ", createUserId=" + createUserId + ", createUserName=" + createUserName + ", createTime=" + createTime + + ", delFlag=" + delFlag + "}"; } } diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java index e4bfec1f..5f58ab43 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; *

* * @author 暮光：城中城 - * @since 2019-03-07 + * @since 2019-03-08 */ public interface WikiSpaceMapper extends BaseMapper { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java index 42134919..28d08b2e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; *

* * @author 暮光：城中城 - * @since 2019-03-07 + * @since 2019-03-08 */ public interface WikiSpaceService extends IService { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java index eb5f0f6d..f0ec885e 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; *

* * @author 暮光：城中城 - * @since 2019-03-07 + * @since 2019-03-08 */ @Service public class WikiSpaceServiceImpl extends ServiceImpl implements WikiSpaceService { diff --git a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql index b19b4498..72d282d7 100644 --- a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql +++ b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : 127.0.0.1 + Source Server : localhost Source Server Type : MySQL - Source Server Version : 50724 - Source Host : 127.0.0.1:3306 + Source Server Version : 50725 + Source Host : localhost:3306 Source Schema : zyplayer_doc_manage Target Server Type : MySQL - Target Server Version : 50724 + Target Server Version : 50725 File Encoding : 65001 - Date: 07/03/2019 20:06:40 + Date: 08/03/2019 22:38:59 */ SET NAMES utf8mb4; @@ -88,7 +88,7 @@ CREATE TABLE `user_info` ( `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `idx_userNo`(`user_no`) USING BTREE COMMENT '登录用户名' -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户信息表' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户信息表' ROW_FORMAT = Compact; -- ---------------------------- -- Records of user_info @@ -104,7 +104,7 @@ 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 utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名字', - `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '父ID', + `parent_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '父ID', `node_type` tinyint(4) NULL DEFAULT 0 COMMENT '节点类型 0=有子节点 1=终节点', `zan_num` int(11) NOT NULL DEFAULT 0 COMMENT '赞的数量', `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID', @@ -115,18 +115,20 @@ CREATE TABLE `wiki_page` ( `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间', `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0=有效 1=删除', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of wiki_page -- ---------------------------- -INSERT INTO `wiki_page` VALUES (7, 1, '测试1', NULL, 0, 1, 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, 4, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-03-06 09:25:29', 0); -INSERT INTO `wiki_page` VALUES (9, 1, '测试3', 7, 0, 0, 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', 0, 0, 1, 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', 0, 0, 4, 1, NULL, '2019-02-24 17:51:56', 1, '暮光：城中城', '2019-03-08 22:12:36', 0); +INSERT INTO `wiki_page` VALUES (9, 1, '测试3', 7, 0, 0, 1, NULL, '2019-02-24 17:51:56', 1, '暮光：城中城', '2019-03-08 22:12:51', 0); INSERT INTO `wiki_page` VALUES (10, 1, '测试4', 7, 0, 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, 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, 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, 2, 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', 0, 0, 2, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); +INSERT INTO `wiki_page` VALUES (17, 2, '数据库团队介绍', 0, 0, 0, 1, '暮光：城中城', '2019-03-07 22:07:10', NULL, NULL, NULL, 0); +INSERT INTO `wiki_page` VALUES (18, 2, '人员列表', 17, 0, 1, 1, '暮光：城中城', '2019-03-07 22:28:47', NULL, NULL, NULL, 0); -- ---------------------------- -- Table structure for wiki_page_comment @@ -167,23 +169,27 @@ CREATE TABLE `wiki_page_content` ( `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_user_id` bigint(20) NULL DEFAULT NULL COMMENT '修改人ID', - `update_user_name` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人名字', + `update_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_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 = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of wiki_page_content -- ---------------------------- INSERT INTO `wiki_page_content` VALUES (1, 7, '

测试1测试1测试1测试1测试1

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56'); -INSERT INTO `wiki_page_content` VALUES (2, 8, '

测试2测试2测试2测试2fasfafafdsafasfxxxxxxxxxxxxdsadsadsadasdasd

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-03-06 09:25:29'); -INSERT INTO `wiki_page_content` VALUES (3, 9, '

测试3测试3测试3测试3测试3

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56'); +INSERT INTO `wiki_page_content` VALUES (2, 8, '

测试2测试2测试2测试2fasfafafdsafasfxxxxxxxxxxxxdsadsadsadasdasd

', 1, NULL, '2019-02-24 17:51:56', 1, '暮光：城中城', '2019-03-08 22:12:36'); +INSERT INTO `wiki_page_content` VALUES (3, 9, '

测试3测试3测试3测试3测试3

', 1, NULL, '2019-02-24 17:51:56', 1, '暮光：城中城', '2019-03-08 22:12:51'); INSERT INTO `wiki_page_content` VALUES (4, 10, '

测试4测试4测试4测试4测试4

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56'); INSERT INTO `wiki_page_content` VALUES (5, 11, '

测试5测试5测试5测试5

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56'); INSERT INTO `wiki_page_content` VALUES (6, 12, '

测试6测试6测试6测试6测试6

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56'); INSERT INTO `wiki_page_content` VALUES (7, 13, '

测试7测试7测试7测试7

', 1, NULL, '2019-02-24 17:51:56', NULL, NULL, '2019-02-24 17:51:56'); INSERT INTO `wiki_page_content` VALUES (8, 14, '

测试7 测试7测试7测试7 

', 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56'); +INSERT INTO `wiki_page_content` VALUES (9, 15, '

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍 

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍 

', 1, NULL, '2019-03-07 22:00:13', NULL, NULL, NULL); +INSERT INTO `wiki_page_content` VALUES (10, 16, '

啦啦啦啦，我是数据库团队介绍  

啦啦啦啦，我是数据库团队介绍   

啦啦啦啦，我是数据库团队介绍  

啦啦啦啦，我是数据库团队介绍  

啦啦啦啦，我是数据库团队介绍   

', 1, '暮光：城中城', '2019-03-07 22:05:34', NULL, NULL, NULL); +INSERT INTO `wiki_page_content` VALUES (11, 17, '

啦啦啦啦，我是数据库团队介绍 

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍

啦啦啦啦，我是数据库团队介绍 

', 1, '暮光：城中城', '2019-03-07 22:07:10', NULL, NULL, NULL); +INSERT INTO `wiki_page_content` VALUES (12, 18, '

我的人员列表 

我的人员列表

我的人员列表

我的人员列表 

', 1, '暮光：城中城', '2019-03-07 22:28:47', NULL, NULL, NULL); -- ---------------------------- -- Table structure for wiki_page_file @@ -204,11 +210,12 @@ CREATE TABLE `wiki_page_file` ( `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_uuid`(`uuid`) USING BTREE COMMENT '文件ID' -) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of wiki_page_file -- ---------------------------- +INSERT INTO `wiki_page_file` VALUES (22, 17, 'loading_mask.png', 'e:/tmp/wikiFiles/2019/03/07/aac61c98a8464eefb38969e3e5e432ee.png', 'aac61c98a8464eefb38969e3e5e432ee', 1, '暮光：城中城', '2019-03-07 22:21:08', NULL, NULL, NULL, 0); -- ---------------------------- -- Table structure for wiki_page_zan @@ -223,13 +230,15 @@ CREATE TABLE `wiki_page_zan` ( `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `yn` tinyint(4) NULL DEFAULT NULL COMMENT '是否有效 0=无效 1=有效', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of wiki_page_zan -- ---------------------------- INSERT INTO `wiki_page_zan` VALUES (7, 8, NULL, 1, '暮光：城中城', '2019-03-06 19:04:26', 1); INSERT INTO `wiki_page_zan` VALUES (8, 14, NULL, 1, '暮光：城中城', '2019-03-07 10:32:18', 1); +INSERT INTO `wiki_page_zan` VALUES (9, 17, NULL, 1, '暮光：城中城', '2019-03-07 22:10:56', 0); +INSERT INTO `wiki_page_zan` VALUES (10, 18, NULL, 1, '暮光：城中城', '2019-03-07 22:53:23', 1); -- ---------------------------- -- Table structure for wiki_space @@ -243,13 +252,18 @@ CREATE TABLE `wiki_space` ( `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 '创建时间', + `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '删除标记 0=正常 1=已删除', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of wiki_space -- ---------------------------- -INSERT INTO `wiki_space` VALUES (1, '研发中心', 1, NULL, 1, NULL, '2019-02-24 17:51:56'); +INSERT INTO `wiki_space` VALUES (1, '研发中心', 1, 'xxxxx', 1, NULL, '2019-02-24 17:51:56', 0); +INSERT INTO `wiki_space` VALUES (2, '数据库团队', 1, '数据库、redis、kafka相关', 1, '暮光：城中城', '2019-03-07 21:49:49', 0); +INSERT INTO `wiki_space` VALUES (3, '测试空间', 1, '', 1, '暮光：城中城', '2019-03-07 21:53:51', 1); +INSERT INTO `wiki_space` VALUES (4, '测试2', 1, '', 1, '暮光：城中城', '2019-03-07 21:54:25', 1); +INSERT INTO `wiki_space` VALUES (5, '研发中心', 1, 'dasdasdasdasd', 1, '暮光：城中城', '2019-03-08 22:27:30', 1); -- ---------------------------- -- Table structure for zyplayer_storage @@ -258,11 +272,15 @@ 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 utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数值', + `doc_value` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 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 = 46 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '存储网页上相关的数据' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 48 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '存储网页上相关的数据' ROW_FORMAT = Compact; + +-- ---------------------------- +-- Records of zyplayer_storage +-- ---------------------------- SET FOREIGN_KEY_CHECKS = 1; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java index ccf10a39..fe62e191 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java @@ -50,7 +50,7 @@ public class WikiPageController { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("del_flag", 0); wrapper.eq("space_id", wikiPage.getSpaceId()); - wrapper.isNull(wikiPage.getParentId() == null, "parent_id"); + wrapper.eq(wikiPage.getParentId() == null, "parent_id", 0); wrapper.eq(wikiPage.getParentId() != null, "parent_id", wikiPage.getParentId()); List authList = wikiPageService.list(wrapper); return DocResponseJson.ok(authList); diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java index f9fff230..02382345 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java @@ -36,6 +36,7 @@ public class WikiSpaceController { public ResponseJson> list(WikiSpace wikiSpace) { DocUserDetails currentUser = DocUserUtil.getCurrentUser(); UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("del_flag", 0); if(wikiSpace.getType() == null) { wrapper.in("type", 1, 2); } else if(wikiSpace.getType() == 1 || wikiSpace.getType() == 2) { @@ -49,7 +50,7 @@ public class WikiSpaceController { } @PostMapping("/update") - public ResponseJson update(WikiSpace wikiSpace) { + public ResponseJson update(WikiSpace wikiSpace) { Long id = wikiSpace.getId(); if (id != null && id > 0) { wikiSpaceService.updateById(wikiSpace); diff --git a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html index ad37251e..f9659ffc 100644 --- a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html +++ b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html @@ -29,6 +29,7 @@ + @@ -41,7 +42,9 @@ - + + @@ -154,16 +157,33 @@ - 立即创建 + 保存修改 + 立即创建 取消 + + + + + + + + + + + + + - - + + @@ -218,7 +238,8 @@ choiceSpace: "", nowSpaceId: '', newSpaceDialogVisible: false, - newSpaceForm: {name: '', spaceExplain: ''}, + manageSpaceDialogVisible: false, + newSpaceForm: {id: '', name: '', spaceExplain: ''}, newSpaceFormRules: { name: [ {required: true, message: '请输入空间名', trigger: 'blur'}, @@ -256,6 +277,37 @@ this.loadSpaceList(); }, methods: { + editSpaceInfo(row) { + app.newSpaceForm = {id: row.id, name: row.name, spaceExplain: row.spaceExplain}; + app.newSpaceDialogVisible = true; + }, + deleteSpaceInfo(row) { + this.$confirm('确定要删除此空间及下面的所有文档吗？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + var param = {id: row.id, delFlag: 1}; + ajaxTemp("zyplayer-doc-wiki/space/update", "post", "json", param, function (json) { + if (validateResult(json)) { + app.loadSpaceList(); + } + }); + }); + }, + handlePageDrop(draggingNode, dropNode, dropType, ev) { + //console.log('tree drop: ', draggingNode.data, dropNode.data, dropType); + // 'prev'、'inner'、'next' + var param = {id: draggingNode.data.id, parentId: dropNode.data.parentId}; + if (dropType == 'inner') { + param.parentId = dropNode.data.id; + } + ajaxTemp("zyplayer-doc-wiki/page/update", "post", "json", param, function (json) { + if (validateResult(json)) { + app.doGetPageList(null); + } + }); + }, onNewSpaceCancel() { this.newSpaceDialogVisible = false; }, @@ -277,18 +329,26 @@ onNewSpaceSubmit(formName) { this.$refs[formName].validate((valid) => { if (valid) { - var param = {name: app.newSpaceForm.name, spaceExplain: app.newSpaceForm.spaceExplain}; + var param = { + id: app.newSpaceForm.id, + name: app.newSpaceForm.name, + spaceExplain: app.newSpaceForm.spaceExplain + }; ajaxTemp("zyplayer-doc-wiki/space/update", "post", "json", param, function (json) { if (validateResult(json)) { - app.newSpaceForm.name = ""; - app.newSpaceForm.spaceExplain = ""; + if (param.id > 0) { + app.loadSpaceList(); + } else { + app.spaceList.push(json.data); + app.spaceOptions.push({ + label: json.data.name, value: json.data.id + }); + app.nowSpaceId = json.data.id; + app.choiceSpace = app.nowSpaceId; + app.doGetPageList(null); + } + app.newSpaceForm = {id: '', name: '', spaceExplain: ''}; app.newSpaceDialogVisible = false; - app.spaceList.push(json.data); - app.spaceOptions.push({ - label: json.data.name, value: json.data.id - }); - app.nowSpaceId = json.data.id; - app.doGetPageList(null); } }); } @@ -426,6 +486,9 @@ if (data == 0) { app.newSpaceDialogVisible = true; app.choiceSpace = app.nowSpaceId; + } else if (data == -1) { + app.manageSpaceDialogVisible = true; + app.choiceSpace = app.nowSpaceId; } else { app.nowSpaceId = data; app.rightContentType = 0; @@ -445,6 +508,7 @@ app.spaceOptions = spaceOptions; if (app.spaceList.length > 0) { app.nowSpaceId = app.spaceList[0].id; + app.choiceSpace = app.nowSpaceId; app.doGetPageList(null); } } @@ -514,6 +578,7 @@ var item = json.data[i]; pathIndex.push({ id: item.id, + parentId: item.parentId || 0, label: item.name, nodePath: nodePath + item.name, children: [{label: '', needLoad: true}],// 初始化一个对象，点击展开时重新查询加载