From 7b698dbc1676116a1b4b17fef021703f991089a1 Mon Sep 17 00:00:00 2001
From: wangrenkang <1173308176@qq.com>
Date: Thu, 11 Jan 2024 17:26:12 +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=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../helper/basic/AbstractMatterCacheHelper.java    | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 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 f5c6fe2..c7411ef 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
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.ningdatech.kqapi.common.constant.BizConst;
 import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq;
 import com.ningdatech.kqapi.zzsfw.entity.entity.MatterKey;
@@ -18,9 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -43,11 +40,15 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
 
     protected LoadingCache<String, String> mattersUrlCache;
 
+    private final String KQ_ZZS_BASE_URL = "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode=&siteCode=330000000000";
+
     private Boolean initMatterCache() {
         List<DscSxAdsShareItemQltQlsxCommonIDVKq> 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));
         if (allMatters.isEmpty()) {
@@ -55,12 +56,14 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
             return Boolean.FALSE;
         }
         allMatters.forEach(m -> {
-            MatterKey key = MatterKey.of(m.getQlName(),m.getWebapplyurl());
+            // 1-11日修改新的url匹配规则，取事项状态为1且qlInnerCodeItem不为空的进行拼接，新的url规则如下
+            String kq_url = KQ_ZZS_BASE_URL.replace("localInnerCode=", "localInnerCode=" + m.getQlInnerCodeItem());
+            MatterKey key = MatterKey.of(m.getQlName(),kq_url);
             if(!mattersUrlCache.asMap().containsKey(m.getQlName())){
-                mattersUrlCache.put(m.getQlName(),m.getWebapplyurl());
+                mattersUrlCache.put(m.getQlName(),kq_url);
             }else{
                 String url = mattersUrlCache.get(m.getQlName());
-                if(StringUtils.isNotBlank(url) && !url.equals(m.getWebapplyurl())){
+                if(StringUtils.isNotBlank(url) && !url.equals(kq_url)){
                     return;
                 }
             }
@@ -69,7 +72,7 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
                 dup.setCountNum(dup.getCountNum() + 1);
                 mattersDupCache.put(key,dup);
             }else{
-                mattersDupCache.put(key,NdKqZzsfwMattersDeduplicate.of(m.getQlName(),m.getWebapplyurl()));
+                mattersDupCache.put(key,NdKqZzsfwMattersDeduplicate.of(m.getQlName(),kq_url));
             }
         });
         return Boolean.TRUE;
@@ -129,13 +132,18 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean {
                 .build(key -> {
                     DscSxAdsShareItemQltQlsxCommonIDVKq matter = kqService.getOne(Wrappers.lambdaQuery(DscSxAdsShareItemQltQlsxCommonIDVKq.class)
                             .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlName, key)
+                            .eq(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlState, "1")
+                            .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl)
+                            .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getQlInnerCodeItem)
+                            .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate)
                             .last(BizConst.LIMIT_1)
-                            .isNotNull(DscSxAdsShareItemQltQlsxCommonIDVKq::getWebapplyurl));
+                    );
                     if (Objects.isNull(matter)) {
                         //查不到直接返回null
                         return null;
                     }
-                    return matter.getWebapplyurl();
+//                    return matter.getWebapplyurl();
+                    return "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode="+ matter.getQlInnerCodeItem() +"&siteCode=330000000000";
                 });
         mattersDupCache = Caffeine.newBuilder()
                 .refreshAfterWrite(7, TimeUnit.DAYS)