Merge remote-tracking branch 'origin/feature-content4' into feature-content4

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java

@@ -82,4 +82,12 @@ public interface HaobanRoleApiService {
      * @return
      */
     ServiceResponse<Void> contentMaterialRoleInit(ContentMaterialROleInitQDTO contentMaterialROleInitQDTO);
+
+    /**
+     * 刷新企业权限 单次
+     * @param params
+     * @return
+     */
+    @Deprecated
+    ServiceResponse<Void> flushRightOneTime(String params);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageListener.java

 package com.gic.haoban.manage.service.service.content.message;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.dubbo.entity.ProviderLocalTag;
 import com.gic.haoban.manage.api.enums.content.MaterialInteractRecordEventType;
 import com.gic.haoban.manage.service.pojo.bo.content.message.InteractRecordMessageBO;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,7 @@ import org.springframework.kafka.listener.MessageListener;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * @Author MUSI
@@ -33,8 +35,9 @@ public class InteractRecordMessageListener implements MessageListener<String, St
 
     @Override
     public void onMessage(ConsumerRecord<String, String> consumerRecord) {
+        ProviderLocalTag providerLocalTag = ProviderLocalTag.tag.get();
+        providerLocalTag.traceId = UUID.randomUUID().toString();
         String value = consumerRecord.value();
-
         log.info("【InteractRecordMessageListener】处理埋点事件 {}", value);
         InteractRecordMessageBO recordMessageBO = JSON.parseObject(value, InteractRecordMessageBO.class);
         if (recordMessageBO == null) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -26,6 +26,7 @@ import com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO;
 import com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO;
 import com.gic.haoban.manage.service.service.TemplateEnterpriseRelatedService;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
+import com.gic.haoban.manage.service.service.content.adaptor.MaterialEnterpriseAdaptor;
 import com.gic.haoban.manage.service.service.role.HaobanMenuService;
 import com.gic.haoban.manage.service.service.role.HaobanRoleMenuService;
 import com.gic.haoban.manage.service.service.role.HaobanRoleService;
@@ -68,6 +69,8 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
     private TabHaobanTemplateApplicationRelatedMapper tabHaobanTemplateApplicationRelatedMapper;
     @Autowired
     private TemplateEnterpriseRelatedService templateEnterpriseRelatedService;
+    @Autowired
+    private MaterialEnterpriseAdaptor materialEnterpriseAdaptor;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -591,4 +594,34 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
     }
 
 
+    /**
+     * 刷新企业权限
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ServiceResponse<Void> flushRightOneTime(String params) {
+
+        logger.info("flushRightOneTime 刷新企业内容权限:{}", params);
+        // 获取所有开通内容高级版的企业
+        List<String> enterpriseIds = materialEnterpriseAdaptor.queryHasRightEnterpriseIds(MaterialEnterpriseAdaptor.MaterialLevel.HIGH.getCode());
+        // 执行刷新权限
+        String enterpriseId = "";
+        if (StringUtils.isNotBlank(params) && StringUtils.equals("-1", params)) {
+            enterpriseId = params;
+        }
+        for (String tempId : enterpriseIds) {
+            if (StringUtils.isNotBlank(tempId) && !StringUtils.equalsIgnoreCase(enterpriseId, tempId)) {
+                logger.info("当前企业:{} 不是目标企业:{}, 忽略", tempId, enterpriseId);
+                continue;
+            }
+            ContentMaterialROleInitQDTO contentMaterialROleInitQDTO = new ContentMaterialROleInitQDTO();
+            contentMaterialROleInitQDTO.setEnterpriseId(enterpriseId);
+            contentMaterialROleInitQDTO.setVersion(MaterialEnterpriseAdaptor.MaterialLevel.HIGH.getCode());
+            logger.info("添加企业素材纬度权限: {}", JSON.toJSONString(contentMaterialROleInitQDTO));
+            this.contentMaterialRoleInit(contentMaterialROleInitQDTO);
+        }
+        return ServiceResponse.success();
+    }
 }

haoban-manage3-service/src/main/resources/mapper/content/TabHaobanInteractRecordMapper.xml

@@ -323,6 +323,7 @@
         update tab_haoban_interact_record
         set member_id = #{memberId}
         where union_id = #{unionId} and delete_flag = 0
+        and (member_id is null or member_id = '')
     </update>
 
 </mapper>