活动投票状态筛选优化

cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TpContentStudentStatusServiceUsing.java

@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yizhi.application.orm.id.IdGenerator;
 import com.yizhi.core.application.cache.CacheNamespace;
 import com.yizhi.core.application.cache.RedisCache;
+import com.yizhi.core.application.context.ContextHolder;
+import com.yizhi.core.application.context.RequestContext;
 import com.yizhi.core.application.task.AbstractTaskHandler;
 import com.yizhi.core.application.task.TaskExecutor;
+import com.yizhi.research.application.feign.ResearchClient;
+import com.yizhi.research.application.vo.api.CheckResearchStateVo;
 import com.yizhi.training.application.constant.ProjectConstant;
 import com.yizhi.training.application.domain.*;
 import com.yizhi.training.application.mapper.*;
@@ -15,7 +19,9 @@ import com.yizhi.training.application.vo.api.TrainingProjectContentPlanVo;
 import com.yizhi.training.application.vo.api.TrainingProjectContentVo;
 import com.yizhi.util.application.constant.TpActivityType;
 import com.yizhi.util.application.enums.i18n.Constants;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -32,6 +38,7 @@ import java.util.stream.Collectors;
  * @Version 1.0
  **/
 @Service
+@Slf4j
 public class TpContentStudentStatusServiceUsing {
 
     @Autowired
@@ -52,6 +59,8 @@ public class TpContentStudentStatusServiceUsing {
     private RedisCache redisCache;
     @Autowired
     private TaskExecutor taskExecutor;
+    @Autowired
+    private ResearchClient researchClient;
     //不参与活动的计算  类型有 3-直播 6-证书 7-外链 14-帖子
     private List<Integer> NOT_CALCULATE = Arrays.asList(6);
 
@@ -183,7 +192,17 @@ public class TpContentStudentStatusServiceUsing {
 
         if (!CollectionUtils.isEmpty(allActivities)) {
 
+            RequestContext context= ContextHolder.get();
+
             for (TpPlanActivity activity : allActivities) {
+                CheckResearchStateVo checkResearchStateVo = new CheckResearchStateVo();
+                checkResearchStateVo.setContext(context);
+                checkResearchStateVo.setResearchId(activity.getRelationId());
+                Integer state = researchClient.checkResearchState(checkResearchStateVo);
+                log.info("查询活动id:{}中,投票id:{}中的投票状态state:{}", activity.getTrainingProjectId(), activity.getRelationId(), state);
+                if(state.intValue() > 2) {
+                    continue;
+                }
                 TrainingProjectContentActivityVo activityVo = new TrainingProjectContentActivityVo();
                 activityVo.setType(activity.getType());
                 activityVo.setRelationId(activity.getRelationId());