sync

src/main/java/com/zzsn/knowbase/controller/KnowledgeController.java

@@ -3,12 +3,14 @@ package com.zzsn.knowbase.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zzsn.knowbase.entity.KbAuthorizedUser;
 import com.zzsn.knowbase.entity.KnowFile;
 import com.zzsn.knowbase.entity.Knowledge;
 import com.zzsn.knowbase.service.IKnowledgeService;
 import com.zzsn.knowbase.service.ILocalFileService;
 import com.zzsn.knowbase.util.DocUtil;
 import com.zzsn.knowbase.util.HttpUtil;
+import com.zzsn.knowbase.util.SpringContextUtils;
 import com.zzsn.knowbase.vo.IntelligentQaParam;
 import com.zzsn.knowbase.vo.KnowledgeParam;
 import com.zzsn.knowbase.vo.KnowledgeVO;
@@ -98,17 +100,18 @@ public class KnowledgeController {
         MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class);
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         List<Result<KnowFile>> resultList = localFileService.upload(fileMap);
-        CompletableFuture.runAsync(()-> this.add(resultList,knowledge));
+        KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
+        CompletableFuture.runAsync(()-> this.add(resultList,knowledge,userInfo));
         return Result.OK("添加成功！");
     }
-    private void add(List<Result<KnowFile>> resultList, Knowledge knowledge){
+    private void add(List<Result<KnowFile>> resultList, Knowledge knowledge,KbAuthorizedUser userInfo){
 
         if (null == resultList || resultList.isEmpty()) {
             return ;
         }
         for (Result<KnowFile> knowFileResult : resultList) {
             knowledge.setId(null);
-            knowledgeService.addKnowledge(knowFileResult.getResult(), knowledge);
+            knowledgeService.addKnowledge(knowFileResult.getResult(), knowledge,userInfo);
         }
     }
 

src/main/java/com/zzsn/knowbase/service/IKnowledgeService.java

 package com.zzsn.knowbase.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zzsn.knowbase.entity.KbAuthorizedUser;
 import com.zzsn.knowbase.entity.KnowFile;
 import com.zzsn.knowbase.entity.Knowledge;
 import com.zzsn.knowbase.vo.KnowledgeParam;
 import com.zzsn.knowbase.vo.KnowledgeVO;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * @Description: 知识服务
  * @Author: chenshiqiang
@@ -20,20 +18,21 @@ public interface IKnowledgeService {
     /**
      * 新增
      */
-    void addKnowledge(KnowFile knowFile, Knowledge knowledge);
+    void addKnowledge(KnowFile knowFile, Knowledge knowledge, KbAuthorizedUser userInfo);
 
     /**
      * 修改
      */
-    void updateKnowledge(Knowledge knowledge) ;
+    void updateKnowledge(Knowledge knowledge);
 
     /**
      * 删除
      */
-    void deleteKnowledge(String ids) ;
+    void deleteKnowledge(String ids);
 
     /**
      * 分页检索
+     *
      * @param knowledgeParam
      * @param pageNo
      * @param pageSize

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

@@ -16,6 +16,7 @@ import com.zzsn.knowbase.service.KbKnowledgeProjectService;
 import com.zzsn.knowbase.util.*;
 import com.zzsn.knowbase.vo.KnowledgeParam;
 import com.zzsn.knowbase.vo.KnowledgeVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.search.join.ScoreMode;
@@ -37,7 +38,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -47,6 +47,7 @@ import java.util.stream.Collectors;
  * @Version: V1.0
  */
 @Service
+@Slf4j
 class KnowledgeServiceImpl implements IKnowledgeService {
     @Autowired
     private RestHighLevelClient client;
@@ -70,8 +71,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
 
 
     @Override
-    public void addKnowledge(KnowFile knowFile, Knowledge knowledge) {
-        KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
+    public void addKnowledge(KnowFile knowFile, Knowledge knowledge,KbAuthorizedUser userInfo) {
         knowledge.setAuthor(userInfo.getName());
         if (null == knowledge.getId()) {
             knowledge.setId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8));