From fbbaa60dc5ee17507f05631f3f73ee579ced4a64 Mon Sep 17 00:00:00 2001 From: v-zhangjc9 Date: Mon, 13 May 2024 10:52:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(info-query):=20=E4=BF=AE=E5=A4=8D=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E4=BC=98=E5=85=88=E7=BA=A7=E6=9F=A5=E8=AF=A2=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E8=A1=A8=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lanyuanxiaoyao/service/info/service/TableMetaService.java | 2 +- .../lanyuanxiaoyao/service/info/service/VersionService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java index e80fd9d..be239f3 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java @@ -116,7 +116,7 @@ public class TableMetaService extends BaseService { .andEq(TbAppHudiSyncState.ID_A, Column.as(StrUtil.format("concat({}, '-', {})", TbAppFlinkJobConfig.ID_A, TbAppCollectTableInfo.ALIAS_A))) .andEq(ObjectUtil.isNotNull(flinkJobId), TbAppFlinkJobConfig.ID_A, flinkJobId) .andEq(StrUtil.isNotBlank(aliasText), TbAppCollectTableInfo.ALIAS_A, aliasText) - .andEq(ObjectUtil.isNotNull(priority), TbAppCollectTableInfo.PRIORITY_A, priority) + .andGe(ObjectUtil.isNotNull(priority), TbAppCollectTableInfo.PRIORITY_A, priority) .andEq(StrUtil.isNotBlank(hdfs), TbAppCollectTableInfo.TGT_HDFS_PATH_A, hdfs) .andEq(TbAppCollectTableInfo.STATUS_A, STATUS_Y) .andEq(TbAppFlinkJobConfig.STATUS_A, STATUS_Y) diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java index 7d8f28f..fcaf173 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java @@ -70,9 +70,9 @@ public class VersionService extends BaseService { .andEq(TbAppCollectTableInfo.STATUS_A, "y") .andEq(TbAppFlinkJobConfig.ID_A, Column.as(TbAppCollectTableVersion.FLINK_JOB_ID_A)) .andEq(TbAppCollectTableInfo.ALIAS_A, Column.as(TbAppCollectTableVersion.ALIAS_A)) - .andEq(TbAppCollectTableInfo.PRIORITY_A, 10000) + .andLt(TbAppCollectTableInfo.PRIORITY_A, 10000) .andEq(TbAppCollectTableInfo.SCHEDULE_ID_A, false) - .andEq(TbAppCollectTableVersion.VERSION_A, "2018"); + .andEq(TbAppCollectTableVersion.VERSION_A, version); } @Cacheable(value = "un-scheduled-normal-table", sync = true)