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

Author: luban08

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

@@ -20,6 +20,6 @@ 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")
+    @Select("SELECT * FROM dss_guide_chapter WHERE is_delete =0 AND (content LIKE CONCAT('%', #{keyword}, '%') OR title 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/impl/GuideGroupMapper.xml

@@ -58,7 +58,11 @@
                b.title_alias AS children_title_alias,
                b.seq AS children_seq,
                b.type AS children_type,
-               b.content_html AS children_content_html
+               b.content_html AS children_content_html,
+               b.create_by AS children_create_by,
+               b.create_time AS children_create_time,
+               b.update_by AS children_update_by,
+               b.update_time AS children_update_time
         FROM dss_guide_group a
         LEFT JOIN (SELECT * FROM dss_guide_content WHERE is_delete =0) b ON a.id = b.group_id
         WHERE a.is_delete =0 AND a.path = #{path}

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/restful/KnowledgeGuideAdminRestful.java

@@ -50,10 +50,9 @@ public class KnowledgeGuideAdminRestful {
     @RequestMapping(path ="/guidecatalog", method = RequestMethod.POST)
     public Message saveGuideCatalog(HttpServletRequest request, @RequestBody GuideCatalog guideCatalog){
         String userName = SecurityFilter.getLoginUsername(request);
-        if(guideCatalog.getId() ==null) {
+        if(null == guideCatalog.getId()) {
             guideCatalog.setCreateBy(userName);
             guideCatalog.setCreateTime(new Date(System.currentTimeMillis()));
-            guideCatalog.setUpdateTime(new Date(System.currentTimeMillis()));
         }
         else{
             guideCatalog.setUpdateBy(userName);
@@ -93,10 +92,9 @@ public Message queryGuideCatalogDetailById(@PathVariable Long id){
     @RequestMapping(path ="/guidechapter", method = RequestMethod.POST)
     public Message saveGuideChapter(HttpServletRequest request, @RequestBody GuideChapter guideChapter){
         String userName = SecurityFilter.getLoginUsername(request);
-        if(guideChapter.getId() ==null) {
+        if(null == guideChapter.getId()) {
             guideChapter.setCreateBy(userName);
             guideChapter.setCreateTime(new Date(System.currentTimeMillis()));
-            guideChapter.setUpdateTime(new Date(System.currentTimeMillis()));
         }
         else{
             guideChapter.setUpdateBy(userName);
@@ -148,7 +146,7 @@ public Message multFileUpload(@RequestParam(required = true) List<MultipartFile>
                     //获取文件后缀名
                     String suffixName = fileName.substring(fileName.lastIndexOf("."));
                     //重新生成文件名
-                    fileName = UUID.randomUUID() + suffixName;
+                    fileName = "knowledge-" + UUID.randomUUID() + suffixName;
                     if (FileUtils.upload(file, localPath, fileName)) {
                         String relativePath =fileName;
                         result.put("relativePath",relativePath);

dss-guide/dss-guide-server/src/main/java/com/webank/wedatasphere/dss/guide/server/restful/PageGuideAdminRestful.java

@@ -46,10 +46,9 @@ public class PageGuideAdminRestful {
     @RequestMapping(path ="/guidegroup", method = RequestMethod.POST)
     public Message saveGuideGroup(HttpServletRequest request, @RequestBody GuideGroup guideGroup){
         String userName = SecurityFilter.getLoginUsername(request);
-        if(guideGroup.getId() ==null) {
+        if(null == guideGroup.getId()) {
             guideGroup.setCreateBy(userName);
             guideGroup.setCreateTime(new Date(System.currentTimeMillis()));
-            guideGroup.setUpdateTime(new Date(System.currentTimeMillis()));
         }
         else{
             guideGroup.setUpdateBy(userName);
@@ -79,10 +78,9 @@ public Message deleteGuideGroup(@PathVariable Long id) {
     @RequestMapping(path ="/guidecontent", method = RequestMethod.POST)
     public Message saveGuideContent(HttpServletRequest request, @RequestBody GuideContent guideConent){
         String userName = SecurityFilter.getLoginUsername(request);
-        if(guideConent.getId() ==null) {
+        if(null == guideConent.getId()) {
             guideConent.setCreateBy(userName);
             guideConent.setCreateTime(new Date(System.currentTimeMillis()));
-            guideConent.setUpdateTime(new Date(System.currentTimeMillis()));
         }
         else{
             guideConent.setUpdateBy(userName);
@@ -151,7 +149,7 @@ public Message multFileUpload(@RequestParam(required = true) List<MultipartFile>
                     //获取文件后缀名
                     String suffixName = fileName.substring(fileName.lastIndexOf("."));
                     //重新生成文件名
-                    fileName = UUID.randomUUID() + suffixName;
+                    fileName = "page-" + UUID.randomUUID() + suffixName;
                     if (FileUtils.upload(file, localPath, fileName)) {
                         String relativePath =fileName;
                         result.put("relativePath",relativePath);