Merge branch 'master' into prod

kgraph-graph/src/main/java/com/kgraph/graph/suport/controller/ExtractKnowledgeSubTaskController.java

@@ -135,4 +135,10 @@ public class ExtractKnowledgeSubTaskController extends BaseController
         return success();
     }
 
+    @GetMapping("/getDocPathBySunTaskId/{sunTaskId}")
+    public AjaxResult getDocPathBySunTaskId(@PathVariable("sunTaskId") Long sunTaskId){
+        AjaxResult success = AjaxResult.success();
+        return success.put(AjaxResult.DATA_TAG, extractKnowledgeSubTaskService.getDocPathBySunTaskId(sunTaskId));
+    }
+
 }

kgraph-graph/src/main/java/com/kgraph/graph/suport/mapper/ExtractKnowledgeSubTaskMapper.java

@@ -68,4 +68,6 @@ public interface ExtractKnowledgeSubTaskMapper
     public int updateSubTaskStatusById(@Param("subTaskId") Long subTaskId, @Param("status") String status, @Param("msg") String msg, @Param("completedDate") Date completedDate);
 
     public int updateTaskStatusBySubTaskId(@Param("subTaskId") Long subTaskId);
+
+    String getDocPathBySunTaskId(Long sunTaskId);
 }

kgraph-graph/src/main/java/com/kgraph/graph/suport/service/IExtractKnowledgeSubTaskService.java

@@ -79,4 +79,6 @@ public interface IExtractKnowledgeSubTaskService
     void saveKnowledge(JSONObject extractResult);
 
     void updateSubTaskStatusById(Long subTaskId, String status, String msg);
+
+    String getDocPathBySunTaskId(Long sunTaskId);
 }

kgraph-graph/src/main/java/com/kgraph/graph/suport/service/impl/ExtractKnowledgeSubTaskServiceImpl.java

@@ -346,4 +346,9 @@ public class ExtractKnowledgeSubTaskServiceImpl implements IExtractKnowledgeSubT
         extractKnowledgeSubTaskMapper.updateSubTaskStatusById(subTaskId, status, msg, new Date());
         extractKnowledgeSubTaskMapper.updateTaskStatusBySubTaskId(subTaskId);
     }
+
+    @Override
+    public String getDocPathBySunTaskId(Long sunTaskId) {
+        return extractKnowledgeSubTaskMapper.getDocPathBySunTaskId(sunTaskId);
+    }
 }

kgraph-graph/src/main/resources/mapper/extract/ExtractKnowledgeSubTaskMapper.xml

@@ -144,4 +144,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     =
                 (SELECT count(*) FROM t_extract_knowledge_sub_task ekst WHERE ekst.id = #{subTaskId} AND ekst.`status` in ('3','5'))
     </update>
+    <select id="getDocPathBySunTaskId" parameterType="Long" resultType="String">
+        SELECT
+            um.file_path
+        FROM
+            t_upload_manage um,
+            t_extract_knowledge_task ekt,
+            t_extract_knowledge_sub_task skst
+        WHERE
+            um.id = ekt.upload_id
+            AND ekt.id = skst.task_id
+            AND skst.id = #{subTaskId}
+    </select>
 </mapper>