修改知识库同步，只使用is_published判断，去掉status的判断

3 files changed, 18 insertions, 14 deletions

diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java
index 913ff44..aa07641 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java
@@ -65,7 +65,7 @@ public class JobUtil {
     }
     public static File createCsvFile(List<Map> maps, String filePath,boolean append) {
         File file = FileUtil.newFile(filePath);
-        try (CsvWriter writer = CsvUtil.getWriter(file, CharsetUtil.CHARSET_UTF_8)) {
+        try (CsvWriter writer = CsvUtil.getWriter(file, CharsetUtil.CHARSET_UTF_8, append)) {
             List result = new ArrayList<String[]>();
             if (ObjectUtil.isNotEmpty(maps)) {
                 Object[] fieldArr = maps.get(0).keySet().toArray();
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java
index 17aa79d..8d391eb 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java
@@ -25,7 +25,7 @@ public class KnowledgeBaseJob {
     @Resource
     KnowledgeBaseService knowledgeBaseService;
 
-    private static final String KNOWLEDGE_BASE_META_SQL = "SELECT a.knowledge_id knowledge_id,name,version,source FROM cn_knowledge_base_sync_version a LEFT JOIN cn_knowledge_base b ON a.knowledge_id=b.knowledge_id WHERE `status`=1";
+    private static final String KNOWLEDGE_BASE_META_SQL = "SELECT a.knowledge_id knowledge_id,name,version,source,`status` FROM cn_knowledge_base_sync_version a LEFT JOIN cn_knowledge_base b ON a.knowledge_id=b.knowledge_id WHERE `is_published`=1";
     private String KNOWLEDGE_BASE_SQL = "SELECT * FROM {0} WHERE knowledge_id={1}";
 
     /**
@@ -73,17 +73,17 @@ public class KnowledgeBaseJob {
                                     }
                                     hasPush = knowledgeBaseService.mmdbBuildPush(builtParam(sink, dbKm, sinkParam));
                                 } else {
-                                    source.put("sql", MessageFormat.format(KNOWLEDGE_BASE_SQL, dbKm.get("source"), dbKm.get("knowledge_id")));
+                                    source.put("sql", MessageFormat.format(KNOWLEDGE_BASE_SQL, dbKm.get("source"), String.valueOf(dbKm.get("knowledge_id"))));
                                     //推送到知识库接口
                                     hasPush = knowledgeBaseService.commonPushFile(source, builtParam(sink, dbKm, sinkParam));
                                 }
                                 String kmMeta = JSONUtil.toJsonStr(dbKm);
                                 if (hasPush) {
                                     knowledgeBaseService.modifyMetadata(String.valueOf(dbKm.get("knowledge_id")), kmMeta);
-                                    JobUtil.infoLog("knowledgeBase push success, metadata : {}  ", kmMeta);
+                                    JobUtil.infoLog("knowledgeBase metadata save success, metadata : {}  ", kmMeta);
                                 } else {
                                     failedTask++;
-                                    JobUtil.infoLog("knowledgeBase push fail, metadata : {}  ", kmMeta);
+                                    JobUtil.infoLog("knowledgeBase metadata save fail, metadata : {}  ", kmMeta);
                                 }
                             }
                         }
@@ -110,7 +110,7 @@ public class KnowledgeBaseJob {
         newParam.put("name", dbKm.get("name"));
         newParam.put("format", sinkParam.get("format"));
         newParam.put("type", sinkParam.get("type"));
-        newParam.put("isValid", 1);
+        newParam.put("isValid", dbKm.get("status"));
         sink.put("params", newParam);
         return sink;
     }
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java
index 08ac51c..80ac3ce 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java
@@ -1,7 +1,6 @@
 package com.mesalab.executor.service.knowledgeBase;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.file.FileWriter;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -72,10 +71,16 @@ public class KnowledgeBaseService {
                 batchData = null;
                 pageNum++;
             }
-            pushStatus = push(knowledgeBase, tmpFile, url);
-        } finally {
+            JobUtil.infoLog("knowledge push file info filename: {},file format: {} , size: {}", tmpFile.getName(), knowledgeBase.getFormat(), tmpFile.length());
+            if (tmpFile.length() > 0) {
+                pushStatus = push(knowledgeBase, tmpFile, url);
+            }
+        } catch (Exception e) {
+            JobUtil.errorLog(e);
+            throw new BusinessException(e);
+        } /*finally {
             FileUtil.del(tmpDir);
-        }
+        }*/
         return pushStatus;
 
     }
@@ -103,7 +108,7 @@ public class KnowledgeBaseService {
         return collect;
     }
 
-    public File creatFile(List<Map> sourceData, String filePath, String format) {
+    public File creatFile(List<Map> sourceData, String filePath, String format) throws Exception {
         File file = null;
         if ("json".equals(format)) {
             FileWriter fileWriter = new FileWriter(filePath, CharsetUtil.CHARSET_UTF_8);
@@ -111,7 +116,6 @@ public class KnowledgeBaseService {
         } else if ("csv".equals(format)) {
             file = JobUtil.createCsvFile(sourceData, filePath, true);
         }
-        sourceData.clear();
         return file;
     }
 
@@ -127,11 +131,11 @@ public class KnowledgeBaseService {
             if (!"-1".equals(resultStr)) {
                 Map<String, Object> result = JSONUtil.toBean(resultStr, Map.class);
                 if (result.get("status") != null && "200".equals(String.valueOf(result.get("status")))) {
-                    JobUtil.infoLog("ip locate knowledgeBase push success");
+                    JobUtil.infoLog("knowledgeBase push success");
                     return true;
                 }
             } else {
-                JobUtil.errorLog("ip locate knowledgeBase push fail");
+                JobUtil.errorLog("knowledgeBase push fail");
             }
         } catch (Exception e) {
             JobUtil.errorLog(e);