feature: 企业维度过滤

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/task/QywxGroupMsgTaskApiServiceImpl.java

@@ -43,9 +43,9 @@ import com.gic.order.api.dto.req.MemberOrderOptional;
 import com.gic.order.api.service.member.MemberOrderReadApiService;
 import com.gic.orderecommerce.api.dto.EorderDTO;
 import com.gic.orderecommerce.api.service.EcommerceOrderOutputApiService;
+import com.gic.redis.data.util.RedisUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.Now;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +59,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -96,6 +97,8 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
     @Autowired
     EnterpriseUseForbidService enterpriseUseForbidService;
 
+    private static final Long cache_hour_sec =  300L;
+
     @Override
     public ServiceResponse<Void> groupMsgTaskJob(String params) {
         log.info("执行触达客户定时任务 {}", DateUtil.datetimeToString(new Date()));
@@ -330,16 +333,28 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
         if (memberOrderBo == null) {
             return ServiceResponse.success();
         }
-
         String enterpriseId = memberOrderBo.getEnterpriseId();
-        ServiceResponse<List<EnterpriseUsingStatusDTO>> tempServiceResponse = enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.CONTENT.getRightMenuCode(), enterpriseId);
-        if (!tempServiceResponse.isSuccess() || CollectionUtils.isEmpty(tempServiceResponse.getResult())) {
-            log.info("企业 {} 没有内容权限 {}", enterpriseId, JSON.toJSONString(tempServiceResponse));
-            return ServiceResponse.success();
+        String key = "haoban_enterprise_content:" + enterpriseId;
+        String cache = RedisUtil.getCache(key, String.class);
+        if (StringUtils.isBlank(cache)) {
+            cache = "0";
+            ServiceResponse<List<EnterpriseUsingStatusDTO>> tempServiceResponse = enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.CONTENT.getRightMenuCode(), enterpriseId);
+            if (!tempServiceResponse.isSuccess() || CollectionUtils.isEmpty(tempServiceResponse.getResult())) {
+                log.info("企业 {} 没有内容权限 {}", enterpriseId, JSON.toJSONString(tempServiceResponse));
+                RedisUtil.setCache(key, cache, cache_hour_sec, TimeUnit.SECONDS);
+                return ServiceResponse.success();
+            }
+            EnterpriseUsingStatusDTO enterpriseUsingStatusDTO = tempServiceResponse.getResult().get(0);
+            if (!Boolean.TRUE.equals(enterpriseUsingStatusDTO.getVaild())) {
+                log.info("企业 {} 内容权限已失效 {}", enterpriseId, JSON.toJSONString(tempServiceResponse));
+                RedisUtil.setCache(key, cache, cache_hour_sec, TimeUnit.SECONDS);
+                return ServiceResponse.success();
+            }
+            cache = "1";
+            RedisUtil.setCache(key, cache, cache_hour_sec, TimeUnit.SECONDS);
         }
-        EnterpriseUsingStatusDTO enterpriseUsingStatusDTO = tempServiceResponse.getResult().get(0);
-        if (!Boolean.TRUE.equals(enterpriseUsingStatusDTO.getVaild())) {
-            log.info("企业 {} 内容权限已失效 {}", enterpriseId, JSON.toJSONString(tempServiceResponse));
+        if (!StringUtils.equals(cache, "1")) {
+            log.info("企业 {} 没有内容权限", enterpriseId);
             return ServiceResponse.success();
         }
         // 订单纬度

haoban-manage3-service/src/test/java/InteractRecordTest.java

@@ -2,6 +2,9 @@ import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.enterprise.api.constant.EnterpriseServiceEnum;
+import com.gic.enterprise.api.dto.enterprise.EnterpriseUsingStatusDTO;
+import com.gic.enterprise.api.service.EnterpriseUseForbidService;
 import com.gic.haoban.manage.api.dto.chat.ChatOwnerTotalDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.content.InteractRecordQDTO;
@@ -43,6 +46,14 @@ public class InteractRecordTest {
     private InteractRecordMessageService interactRecordMessageService;
     @Autowired
     InteractRecordApiService interactRecordApiService;
+    @Autowired
+    private EnterpriseUseForbidService enterpriseUseForbidService;
+
+    @Test
+    public void test2222() {
+        ServiceResponse<List<EnterpriseUsingStatusDTO>> code = enterpriseUseForbidService.getUseEnterpriseByCode(EnterpriseServiceEnum.CONTENT.getRightMenuCode(), eid);
+        System.out.println(JSON.toJSONString(code));
+    }
 
 
     String eid = "ff8080815dacd3a2015dacd3ef5c0000";