adjust the upload

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

@@ -3,8 +3,10 @@ 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.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.vo.IntelligentQaParam;
@@ -17,6 +19,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.util.WebUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
@@ -38,6 +43,9 @@ public class KnowledgeController {
     @Value("${python.intelligentQaUrl:}")
     private String intelligentQaUrl;
 
+    @Autowired
+    private ILocalFileService localFileService;
+
     /**
      * 分页列表查询
      */
@@ -74,7 +82,14 @@ public class KnowledgeController {
     @ApiOperation(value = "知识-添加", notes = "知识-添加")
     @PostMapping(value = "/uploadKnowledge")
     public Result<?> uploadKnowledge(HttpServletRequest request,  Knowledge knowledge) {
-        knowledgeService.addKnowledge(request,knowledge);
+        MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(request, MultipartHttpServletRequest.class);
+        MultipartFile file = multipartRequest.getFile("file");
+
+        Result<KnowFile> upload = localFileService.upload(file, knowledge.getId());
+        if(null==upload||upload.getResult()==null){
+            return Result.error("上传文件失败");
+        }
+        knowledgeService.addKnowledge(upload.getResult(),knowledge);
         return Result.OK("添加成功！");
     }
 

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.KnowFile;
 import com.zzsn.knowbase.entity.Knowledge;
 import com.zzsn.knowbase.vo.KnowledgeParam;
 import com.zzsn.knowbase.vo.KnowledgeVO;
@@ -19,7 +20,7 @@ public interface IKnowledgeService {
     /**
      * 新增
      */
-    void addKnowledge(HttpServletRequest httpServletRequest,Knowledge knowledge);
+    void addKnowledge(KnowFile knowFile, Knowledge knowledge);
 
     /**
      * 修改

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

@@ -69,17 +69,10 @@ class KnowledgeServiceImpl implements IKnowledgeService {
 
     @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private ILocalFileService localFileService;
-
-    @Override
-    public void addKnowledge(HttpServletRequest httpServletRequest, Knowledge knowledge) {
 
-        MultipartHttpServletRequest multipartRequest = WebUtils.getNativeRequest(httpServletRequest, MultipartHttpServletRequest.class);
-        MultipartFile file = multipartRequest.getFile("file");
-
-        Result<KnowFile> upload = localFileService.upload(file, knowledge.getId());
 
+    @Override
+    public void addKnowledge(KnowFile knowFile, Knowledge knowledge) {
         if (null == knowledge.getId()) {
             knowledge.setId(codeGenerateUtil.geneIdNo(Constants.FINANCE, 8));
         }
@@ -90,7 +83,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
         knowledge.setCreateTime(cn.hutool.core.date.DateUtil.formatDateTime(new Date()).replace(" ", "T"));
         knowledge.setDeleteFlag(0);
         List<KnowFile> knowFileList = new ArrayList<>();
-        knowFileList.add(upload.getResult());
+        knowFileList.add(knowFile);
         knowledge.setFiles(knowFileList);
         List<Content> contentList = new ArrayList<>();
         List<String> contentStringList = new ArrayList<>();

src/main/java/com/zzsn/knowbase/vo/KnowledgeParam.java

@@ -49,13 +49,33 @@ public class KnowledgeParam {
      * 类型
      */
     private String types;
-
+    /**
+     * 发布开始时间
+     */
     private String startTime;
+    /**
+     * 发布结束时间
+     */
     private String endTime;
+    /**
+     * 搜索信息
+     */
     private String searchInfo;
+    /**
+     * 范围 1标题 2正文
+     */
     private Integer searchScope;
+    /**
+     * 精确搜索
+     */
     private String searchAccuracy;
+    /**
+     * 审核开始时间
+     */
     private String verifyStartTime;
+    /**
+     * 审核结束时间
+     */
     private String verifyEndTime;
 
 }