diff options
| author | zhanghongqing <[email protected]> | 2022-09-20 10:06:10 +0800 |
|---|---|---|
| committer | zhanghongqing <[email protected]> | 2022-09-20 10:06:10 +0800 |
| commit | cd6fbe7c5eb5893d359b22cb7df30a329ee9c87b (patch) | |
| tree | 2d4d8b527fcaa3cde20230d349d867b74673625e | |
| parent | 2e3f4612c0f816b0188174dd7a9bacc8b1797320 (diff) | |
Galaxy Assessment Event 增加vsys_id=1为内置值
| -rw-r--r-- | galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/Constant.java | 2 | ||||
| -rw-r--r-- | galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataflowJob.java | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/Constant.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/Constant.java index de4851d..0116f8d 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/Constant.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/Constant.java @@ -16,7 +16,7 @@ public class Constant { public static final String TEXT_XML = "text/xml"; public static final String UTF_8 = "UTF-8"; - public static final String DEFAULT_VSYS_ID_VALUE = "1"; + public static final Integer DEFAULT_VSYS_ID_VALUE = 1; public static final String VSYS_ID = "vsys_id"; diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataflowJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataflowJob.java index 2519061..94d3666 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataflowJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataflowJob.java @@ -160,9 +160,8 @@ public class DataflowJob { String assessmentType = "web-sketch"; String features = ""; String dataSource = "tsg_galaxy_v3.assessment_event"; - String vsysId = UrlUtil.getParamByUrl(httpParams.get(0).getUrl(), VSYS_ID); //vsys_id,内置虚拟系统id默认为 1 - String defVsysId = Optional.ofNullable(vsysId).orElse(DEFAULT_VSYS_ID_VALUE); + Integer defVsysId =DEFAULT_VSYS_ID_VALUE; String insertTemplate = "INSERT INTO {0} (common_log_id,common_recv_time,assessment_date,lot_number,file_name,assessment_file,assessment_type,features,`size`,file_checksum_sha,vsys_id) " + "VALUES({1,number,#},{2,number,#},{3,number,#},''{4}'',''{5}'',''{6}'',''{7}'',''{8}'',{9,number,#},''{10}'',{11,number,#});"; long logId = SnowflakeId.generateId(1, 1); @@ -182,9 +181,6 @@ public class DataflowJob { features = i == httpParams.size() - 1 ? features.concat(store).concat(" domains") : features.concat(store).concat(" domains,"); HttpParam httpParam = httpParams.get(i); - if (vsysId == null) { - httpParam.setUrl(UrlUtil.appendUrl(httpParam.getUrl(), ImmutableMap.of(VSYS_ID, defVsysId))); - } tmpFiles[i] = JobUtil.createCsvFile(queryCk(httpParams.get(i)), tmpDir.concat(filePrefix).concat("-").concat(store).concat(".csv")); } @@ -215,7 +211,7 @@ public class DataflowJob { } } //元数据存入ck库 - String insertSql = MessageFormat.format(insertTemplate, dataSource, logId, now, now, lotNumber, zipName, assessmentFile, assessmentType, features, fileSize, sha256Hex, TypeUtils.castToInt(defVsysId)); + String insertSql = MessageFormat.format(insertTemplate, dataSource, logId, now, now, lotNumber, zipName, assessmentFile, assessmentType, features, fileSize, sha256Hex, defVsysId); Map<String, Object> ckParamMap = storeConfig.getCkSource(); ckParamMap.put("query", insertSql); |