Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java

@@ -1,5 +1,13 @@
package com.panzhihua.timejob.jobhandler;

import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
@@ -12,13 +20,8 @@
import com.panzhihua.common.service.user.UserService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -39,8 +42,10 @@

    /**
     * 定时任务刷新党建动态发布状态
     * 
     * @return 刷新个数
     * @throws Exception 出现的异常
     * @throws Exception
     *             出现的异常
     */
    @XxlJob("timedtaskpartybuildingstatusJobHandler")
    public ReturnT<String> timedtaskpartybuildingstatusJobHandler(String param) throws Exception {
@@ -52,8 +57,10 @@

    /**
     * 定时任务取消党建活动
     * 
     * @return 取消个数
     * @throws Exception 出现的异常
     * @throws Exception
     *             出现的异常
     */
    @XxlJob("timedTaskPartyBuildingActivityJobHandler")
    public ReturnT<String> timedTaskPartyBuildingActivityJobHandler(String param) throws Exception {
@@ -62,7 +69,8 @@
        if (R.isOk(r)) {
            Object data = r.getData();
            if (!ObjectUtils.isEmpty(data)) {
                List<PartyBuildingActivityVO> partyBuildingActivityVOS= JSONArray.parseArray(JSONArray.toJSONString(data),PartyBuildingActivityVO.class);
                List<PartyBuildingActivityVO> partyBuildingActivityVOS =
                    JSONArray.parseArray(JSONArray.toJSONString(data), PartyBuildingActivityVO.class);
                if (!ObjectUtils.isEmpty(partyBuildingActivityVOS)) {
                    partyBuildingActivityVOS.forEach(partyBuildingActivityVO -> {
                        List<Long> userIds = partyBuildingActivityVO.getUserIds();
@@ -96,8 +104,10 @@

    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     * 
     * @return 刷新个数
     * @throws Exception 出现的异常
     * @throws Exception
     *             出现的异常
     */
    @XxlJob("timedTaskPartyBuildingActivityAllJobHandler")
    public ReturnT<String> timedTaskPartyBuildingActivityAllJobHandler(String param) throws Exception {
@@ -111,11 +121,13 @@
                activityList.forEach(activityId -> {
                    R r1 = partyBuildingService.getTaskPbActivityPeopleList(activityId);
                    if (R.isOk(r1)){
                        List<ComActActivityPeopleVO> peopleList = JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), ComActActivityPeopleVO.class);
                        List<ComActActivityPeopleVO> peopleList =
                            JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), ComActActivityPeopleVO.class);
                        if(!peopleList.isEmpty()){
                            peopleList.forEach(people -> {
                                communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(people.getActivityId()
                                        ,AddComActIntegralUserDTO.integralType.cydyhd,people.getCommunityId(),people.getUserId()));
                                communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(
                                    people.getActivityId(), AddComActIntegralUserDTO.integralType.cydyhd,
                                    people.getCommunityId(), people.getUserId()));
                            });
                        }
                    }