Merge branch 'feature-sprint2' of https://10.30.90.89:10080/luban/dataspherestudio into feature-sprint2

Author: luban08

conf/dss-guide-server.properties

@@ -19,6 +19,10 @@
 # Spring configurations
 spring.server.port=9210
 spring.spring.application.name=dss-guide-server
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
 wds.linkis.server.version=v1
 
 wds.linkis.log.clear=true
@@ -38,4 +42,5 @@ wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.dss.guide.server.d
 #wds.linkis.gateway.url=http://127.0.0.1:9001/
 
 ## guide_images_path
-guide.content.images.path=/opt/dss/dss-guide-server/guide_images/
+guide.content.images.path=/opt/dss/dss-guide-server/guide_images/
+guide.chapter.images.path=/opt/dss/dss-guide-server/guide_images/

db/dss_ddl.sql

@@ -1291,6 +1291,7 @@ alter table dss_orchestrator_version_info  add  context_id varchar(200) DEFAULT
 
 ALTER TABLE dss_onestop_user_favorites  ADD COLUMN `type`  varchar(20) comment '类型,区分收藏和盯一盯';
 
+
 /**
  * 鲁班产品及文档 dss-guide
  */
@@ -1327,3 +1328,33 @@ CREATE TABLE IF NOT EXISTS `dss_guide_content` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导页面内容详情';
 
+
+DROP TABLE IF EXISTS `dss_guide_catalog`;
+CREATE TABLE IF NOT EXISTS `dss_guide_catalog` (
+  `id` BIGINT(13) NOT NULL AUTO_INCREMENT,
+  `parent_id` BIGINT(13) NOT NULL COMMENT '父级目录ID，-1代表最顶级目录',
+  `title` VARCHAR(50) DEFAULT NULL COMMENT '标题',
+  `description` VARCHAR(200) DEFAULT NULL COMMENT '描述',
+  `create_by` VARCHAR(255) DEFAULT NULL COMMENT '创建者',
+  `create_time` DATETIME DEFAULT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` VARCHAR(255) DEFAULT NULL COMMENT '更新者',
+  `update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `is_delete` TINYINT(1) DEFAULT '0' COMMENT '0:未删除(默认), 1已删除',
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导知识库目录';
+
+DROP TABLE IF EXISTS `dss_guide_chapter`;
+CREATE TABLE IF NOT EXISTS `dss_guide_chapter` (
+  `id` BIGINT(13) NOT NULL AUTO_INCREMENT,
+  `catalog_id` BIGINT(13) NOT NULL COMMENT '目录ID',
+  `title` VARCHAR(50) DEFAULT NULL COMMENT '标题',
+  `title_alias` VARCHAR(50) DEFAULT NULL COMMENT '标题简称',
+  `content` TEXT DEFAULT NULL COMMENT 'Markdown格式的内容',
+  `content_html` TEXT DEFAULT NULL COMMENT 'Markdown转换为html内容',
+  `create_by` varchar(255) DEFAULT NULL COMMENT '创建者',
+  `create_time` datetime DEFAULT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(255) DEFAULT NULL COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `is_delete` tinyint(1) DEFAULT '0' COMMENT '0:未删除(默认), 1已删除',
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='用户向导知识库文章';

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/conf/GuideConf.java

@@ -12,4 +12,5 @@
 public interface GuideConf {
     CommonVars<String> GUIDE_CONTENT_IMAGES_PATH = CommonVars.apply("guide.content.images.path", "/usr/local/anlexander/all_bak/dss_linkis/dss-linkis-1.0.2/images");
 
+    CommonVars<String> GUIDE_CHAPTER_IMAGES_PATH = CommonVars.apply("guide.chapter.images.path", "/usr/local/anlexander/all_bak/dss_linkis/dss-linkis-1.0.2/images");
 }

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/dao/GuideCatalogMapper.java

@@ -0,0 +1,28 @@
+package com.webank.wedatasphere.dss.guide.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.webank.wedatasphere.dss.guide.server.entity.GuideCatalog;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author suyc
+ * @Classname GuideCatalogMapper
+ * @Description TODO
+ * @Date 2022/1/13 20:30
+ * @Created by suyc
+ */
+@Mapper
+public interface GuideCatalogMapper extends BaseMapper<GuideCatalog> {
+    /**
+     * parent_id =-1 标识该目录属于最顶层的一级目录
+     */
+    @Select("SELECT * FROM dss_guide_catalog WHERE is_delete =0 AND parent_id =-1 ORDER BY id ASC")
+    List<GuideCatalog> queryGuideCatalogListForTop();
+
+    @Select("SELECT * FROM dss_guide_catalog WHERE is_delete =0 AND parent_id =#{id} ORDER BY id ASC")
+    List<GuideCatalog> queryGuideCatalogChildrenById(@Param("id") Long id);
+}

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/dao/GuideChapterMapper.java

@@ -0,0 +1,25 @@
+package com.webank.wedatasphere.dss.guide.server.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.webank.wedatasphere.dss.guide.server.entity.GuideChapter;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author suyc
+ * @Classname GuideChapterMapper
+ * @Description TODO
+ * @Date 2022/1/13 20:31
+ * @Created by suyc
+ */
+@Mapper
+public interface GuideChapterMapper extends BaseMapper<GuideChapter> {
+    @Select("SELECT * FROM dss_guide_chapter WHERE is_delete =0 AND catalog_id =#{catalogId} ORDER BY id ASC")
+    List<GuideChapter> queryGuideChapterListByCatalogId(@Param("catalogId") Long catalogId);
+
+    @Select("SELECT * FROM dss_guide_chapter WHERE is_delete =0 AND content LIKE CONCAT('%', #{keyword}, '%') ORDER BY id ASC")
+    List<GuideChapter> searchGuideChapterListByKeyword(@Param("keyword") String keyword);
+}

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/dao/GuideContentMapper.java

@@ -22,11 +22,11 @@ public interface GuideContentMapper extends BaseMapper<GuideContent> {
     List<GuideContent> getGuideContentListByPath(@Param("path") String path);
 
     @Select("SELECT content FROM dss_guide_content WHERE id=#{id}")
-    String getContentById(@Param("id") long id);
+    String getGuideContentById(@Param("id") long id);
 
     @Update("UPDATE dss_guide_content SET content =#{content},content_html =#{contentHtml} WHERE id =#{id}")
-    void updateContentById(@Param("id") long id, @Param("content") String content, @Param("contentHtml") String contentHtml);
+    void updateGuideContentById(@Param("id") long id, @Param("content") String content, @Param("contentHtml") String contentHtml);
 
-    @Update("UPDATE dss_guide_content SET `is_delete` = 1,`update_time` = NOW() WHERE `id` = #{id}")
-    void deleteContent(@Param("id") Long id);
+//    @Update("UPDATE dss_guide_content SET `is_delete` = 1,`update_time` = NOW() WHERE `id` = #{id}")
+//    void deleteGuideContent(@Param("id") Long id);
 }

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/dao/GuideGroupMapper.java

@@ -4,8 +4,6 @@
 import com.webank.wedatasphere.dss.guide.server.entity.GuideGroup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -22,6 +20,6 @@ public interface GuideGroupMapper extends BaseMapper<GuideGroup> {
 
     List<GuideGroup> getAllGuideGroupDetails();
 
-    @Update("UPDATE dss_guide_group SET `is_delete` = 1,`update_time` = NOW() WHERE `id` = #{id}")
-    void deleteGroup(@Param("id") Long id);
+//    @Update("UPDATE dss_guide_group SET `is_delete` = 1,`update_time` = NOW() WHERE `id` = #{id}")
+//    void deleteGuideGroup(@Param("id") Long id);
 }

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/dao/impl/GuideCatalogMapper.xml

@@ -0,0 +1,4 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.webank.wedatasphere.dss.guide.server.dao.GuideCatalogMapper">
+
+</mapper>

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/dao/impl/GuideChapterMapper.xml

@@ -0,0 +1,4 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.webank.wedatasphere.dss.guide.server.dao.GuideChapterMapper">
+
+</mapper>

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/entity/GuideCatalog.java

@@ -0,0 +1,40 @@
+package com.webank.wedatasphere.dss.guide.server.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author suyc
+ * @Classname GuideCatalog
+ * @Description TODO
+ * @Date 2022/1/13 16:40
+ * @Created by suyc
+ */
+@Data
+@TableName(value = "dss_guide_catalog")
+public class GuideCatalog {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    private Long parentId;
+
+    private String title;
+    private String description;
+
+    private String createBy;
+    private String updateBy;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    //private Integer isDelete;
+}