From df61b908953e006ed91c5687c1066dbab605e1e2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 2 Mar 2023 15:38:16 +0800
Subject: [PATCH] clearCustomerTag

---
 .../java/com/epmet/feign/GovOrgOpenFeignClient.java    |  4 ++--
 .../main/java/com/epmet/controller/TagController.java  |  1 +
 .../com/epmet/service/impl/TagCustomerServiceImpl.java | 10 ++++++++--
 .../java/com/epmet/service/impl/TagServiceImpl.java    |  2 ++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index f5fba673b1..3e4d5e9c7e 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -21,8 +21,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
- //@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092")
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class)
+ @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092")
+// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class)
 public interface GovOrgOpenFeignClient {
 
     /**
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java
index 028897d4a0..b075d50df7 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/TagController.java
@@ -32,6 +32,7 @@ public class TagController {
      * @Description  已发布列表页的标签——政府端
      * @param tokenDto
      * @author zxc
+     * 补充：pc党建声音查询条件、新增弹框中的标签下拉框也调用的此接口
      */
     @PostMapping("taglist")
 //    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_PUBLISHED_LIST)
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
index 28997231cc..986278609f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagCustomerServiceImpl.java
@@ -39,6 +39,7 @@ import com.epmet.dto.result.UpdateTagUseCountsResultDTO;
 import com.epmet.entity.TagCustomerEntity;
 import com.epmet.entity.TagScopeEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.redis.TagRedis;
 import com.epmet.service.TagCustomerService;
 import com.epmet.utils.TagColorUtils;
 import com.github.pagehelper.PageHelper;
@@ -68,7 +69,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
     private TagScopeDao tagScopeDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
-
+    @Autowired
+    private TagRedis tagRedis;
 
     /**
      * pc标签管理-分页查询
@@ -118,6 +120,8 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeDao.insert(tagScopeEntity);
             });
         }
+        //删除redis缓存
+        tagRedis.clearCustomerTag(dto.getCustomerId());
     }
 
     /**
@@ -149,6 +153,7 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 tagScopeDao.insert(tagScopeEntity);
             });
         }
+        tagRedis.clearCustomerTag(dto.getCustomerId());
     }
 
     @Override
@@ -199,6 +204,7 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
                 .set(TagCustomerEntity::getUpdatedTime, new Date())
                 .set(TagCustomerEntity::getShowFlag,showFlag);
         baseDao.update(null,tagCustomerUpdateWrapper);
+        tagRedis.clearCustomerTag(EpmetRequestHolder.getLoginUserCustomerId());
     }
 
     /**
@@ -224,7 +230,7 @@ public class TagCustomerServiceImpl extends BaseServiceImpl<TagCustomerDao, TagC
         Result<List<AgencyResultDTO>> communityRes = govOrgOpenFeignClient.getAllCommunity(customerId);
         if (communityRes.success() && CollectionUtils.isNotEmpty(communityRes.getData())) {
             int communityTotal = communityRes.getData().size();
-            int num = 1;
+            int num = 0;
             for (TagCustomerEntity tag : tagList) {
                 for (AgencyResultDTO agencyResultDTO : communityRes.getData()) {
                     TagScopeEntity tagScopeEntity = new TagScopeEntity();
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java
index cbfba74bb5..b85a637634 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java
@@ -57,6 +57,7 @@ public class TagServiceImpl implements TagService {
      * @Description  已发布列表页的标签——政府端
      * @param tokenDto
      * @author zxc
+     * 补充：pc党建声音查询条件、新增弹框中的标签下拉框也调用的此接口
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -64,6 +65,7 @@ public class TagServiceImpl implements TagService {
         String customerId = tokenDto.getCustomerId();
         List<TagInfoResultDTO> resultDtos = tagRedis.zRevRange(customerId);
         if (resultDtos.size() == NumConstant.ZERO){
+            //初始化标签
             resultDtos = this.initTags(customerId);
         }
         return resultDtos;