From fc278581f3bcba49edf8a8bc884dc377a231229c Mon Sep 17 00:00:00 2001 From: wangrenkang <1173308176@qq.com> Date: Fri, 12 Jan 2024 10:42:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E4=B8=8A=E5=8A=9E?= =?UTF-8?q?=E7=90=86=E5=9C=B0=E5=9D=80webapplyurl=E8=A7=84=E5=88=992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../helper/basic/AbstractMatterCacheHelper.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java index c7411ef..9d46ac5 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java @@ -45,12 +45,17 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { private Boolean initMatterCache() { List allMatters = kqService .list(Wrappers.lambdaQuery(DscSxAdsShareItemQltQlsxCommonIDVKq.class) - .select(DscSxAdsShareItemQltQlsxCommonIDVKq::getRowguid,DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName, - DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl) - .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1") - .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem) - .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl) - .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate)); + .select(DscSxAdsShareItemQltQlsxCommonIDVKq::getRowguid, + DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName, + DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, + DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem, + DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl) + .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1") + .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl) + // 确保getQlInnerCodeItem字段不为null且不为"" + .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem) + .ne(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem, "") + .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate)); if (allMatters.isEmpty()) { log.warn("事项数据未初始化"); return Boolean.FALSE; @@ -132,9 +137,9 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { .build(key -> { DscSxAdsShareItemQltQlsxCommonIDVKq matter = kqService.getOne(Wrappers.lambdaQuery(DscSxAdsShareItemQltQlsxCommonIDVKq.class) .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName, key) - .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1") +// .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1") +// .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem) .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl) - .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem) .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate) .last(BizConst.LIMIT_1) ); @@ -142,8 +147,8 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { //查不到直接返回null return null; } -// return matter.getWebapplyurl(); - return "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode="+ matter.getQlInnerCodeItem() +"&siteCode=330000000000"; + return matter.getWebapplyurl(); +// return "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode="+ matter.getQlInnerCodeItem() +"&siteCode=330000000000"; }); mattersDupCache = Caffeine.newBuilder() .refreshAfterWrite(7, TimeUnit.DAYS)