Merge remote-tracking branch 'origin/master'

src/main/java/com/zzsn/knowbase/entity/Knowledge.java

@@ -112,6 +112,9 @@ public class Knowledge implements Serializable {
     private List<Content> contents;
     private List<KnowFile> files;
     private Integer score;
+    /**
+     * 0word 1excel 2ppt 3pdf
+     */
     private Integer importData;
 
 }

src/main/java/com/zzsn/knowbase/service/impl/KnowledgeServiceImpl.java

@@ -124,6 +124,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
                 String path = filesStorage + knowledge.getFiles().get(0).getFilePath();
                 String filePath = null;
                 if (".pdf".equals(knowFile.getFileType())) {
+                    knowledge.setImportData(3);
                     log.info("pdf");
                     try {
                         PDDocument document = PDDocument.load(new File(path));
@@ -254,6 +255,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
             knowledgeMessage.setKbKnowledgeId(knowledgeVO.getKbKnowledgeId());
             knowledgeMessage.setKnowledgeProjectId(knowledgeVO.getKnowledgeProjectId());
             knowledgeMessage.setType(knowledgeVO.getTypeId());
+            knowledgeMessage.setId(knowledgeVO.getId());
 
         }
         //删除