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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -1,40 +1,50 @@
package com.panzhihua.service_community.service.impl;

import com.alibaba.fastjson.JSONArray;
import java.text.DecimalFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import com.panzhihua.service_community.model.dos.ComActActPictureDO;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ExcelElderAuthDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.dao.ComActActRegistDAO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO;
import com.panzhihua.service_community.model.dos.ComActActEvaluateDO;
import com.panzhihua.service_community.model.dos.ComActActRegistDO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import lombok.extern.slf4j.Slf4j;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -44,17 +54,30 @@
 **/
@Slf4j
@Service
public class ComActActivityServiceImpl extends ServiceImpl<ComActActivityDAO, ComActActivityDO> implements ComActActivityService {
public class ComActActivityServiceImpl extends ServiceImpl<ComActActivityDAO, ComActActivityDO>
    implements ComActActivityService {
    private static final String DELIMITER = ":";
    private static final String ACTIVITY_SIGN_IN = "ACTIVITY:SIGN:IN";
    @Resource
    private ComActActivityDAO comActActivityDAO;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    private UserService userService;
    @Resource
    private ComActActEvaluateDAO comActActEvaluateDAO;
    @Resource
    private ComActActRegistDAO comActActRegistDAO;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private ComActActPictureDAO comActActPictureDAO;

    /**
     * 新增社区活动
     * @param comActActivityVO 新增信息
     * 
     * @param comActActivityVO
     *            新增信息
     * @return 新增结果
     */
    @Override
@@ -81,15 +104,25 @@
        if(!save){
            return R.fail();
        }
        ComActActivityDO one = this.getOne(new QueryWrapper<ComActActivityDO>().lambda().eq(ComActActivityDO::getActivityName, comActActivityDO.getActivityName()).orderByDesc(ComActActivityDO::getCreateAt).last(" limit 1 "));
        ComActActivityDO one = this.getOne(new QueryWrapper<ComActActivityDO>().lambda()
            .eq(ComActActivityDO::getActivityName, comActActivityDO.getActivityName())
            .orderByDesc(ComActActivityDO::getCreateAt).last(" limit 1 "));
        Long activityId = one.getId();

        //保存上传照片
        ComActActPictureDO comActActPictureDO = new ComActActPictureDO();
        comActActPictureDO.setActivityId(activityId);
        comActActPictureDO.setUserId(comActActivityVO.getUserId());
        comActActPictureDO.setUploadPicture(comActActivityVO.getCover());
        comActActPictureDAO.insert(comActActPictureDO);
        return R.ok(activityId);
    }

    /**
     * 编辑社区活动
     *
     * @param comActActivityVO 编辑内容
     * @param comActActivityVO
     *            编辑内容
     * @return 编辑结果
     */
    @Override
@@ -99,7 +132,8 @@
            return R.fail("未找到社区活动");
        }

        if(!comActActivityDO.getActivityAddr().equals(comActActivityVO.getActivityAddr()) || !comActActivityDO.getBeginAt().equals(comActActivityVO.getBeginAt())){
        if (!comActActivityDO.getActivityAddr().equals(comActActivityVO.getActivityAddr())
            || !comActActivityDO.getBeginAt().equals(comActActivityVO.getBeginAt())) {
            //修改活动开始时间与活动地点需要推送订阅消息给用户
            ActivitySignVO activitySignVO = new ActivitySignVO();
            activitySignVO.setActivityId(comActActivityVO.getId());
@@ -111,11 +145,14 @@

                    activitySignVOS.forEach(activitySignVO1 -> {
                        //变更社区活动推送订阅消息给用户
                        WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(),accessToken,comActActivityVO.getActivityName()
                                , com.panzhihua.common.utlis.DateUtils.format(comActActivityDO.getBeginAt()
                                        , com.panzhihua.common.utlis.DateUtils.ymdhms_format),comActActivityDO.getActivityAddr(),
                                com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt()
                                        , com.panzhihua.common.utlis.DateUtils.ymdhms_format),comActActivityVO.getActivityAddr());
                        WxUtil.sendSubscribeHDBG(activitySignVO1.getOpenid(), accessToken,
                            comActActivityVO.getActivityName(),
                            com.panzhihua.common.utlis.DateUtils.format(
                                comActActivityDO.getBeginAt(), com.panzhihua.common.utlis.DateUtils.ymdhms_format),
                            comActActivityDO.getActivityAddr(),
                            com.panzhihua.common.utlis.DateUtils.format(comActActivityVO.getBeginAt(),
                                com.panzhihua.common.utlis.DateUtils.ymdhms_format),
                            comActActivityVO.getActivityAddr());
                    });
                }catch (Exception e){
                    log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -139,7 +176,8 @@
    /**
     * 分页查询社区活动
     *
     * @param comActActivityVO 查询参数
     * @param comActActivityVO
     *            查询参数
     * @return 分页集合
     */
    @Override
@@ -171,7 +209,8 @@
    /**
     * 发布活动
     *
     * @param comActActivityVO 主键id 发布时间
     * @param comActActivityVO
     *            主键id 发布时间
     * @return 发布结果
     */
    @Override
@@ -190,7 +229,8 @@
    /**
     * 取消活动
     *
     * @param comActActivityVO 取消原因
     * @param comActActivityVO
     *            取消原因
     * @return 取消结果
     */
    @Override
@@ -209,7 +249,8 @@
    /**
     * 活动详情
     *
     * @param id 活动id
     * @param id
     *            活动id
     * @param userId
     * @return 详情
     */
@@ -234,13 +275,15 @@
    /**
     * 活动报名名单
     *
     * @param activitySignVO 查询参数
     * @param activitySignVO
     *            查询参数
     * @return 报名人员集合
     */
    @Override
    public R listActivitySign(ActivitySignVO activitySignVO) {

        IPage<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(new Page(activitySignVO.getPageNum(),activitySignVO.getPageSize()),activitySignVO);
        IPage<ActivitySignVO> activitySignVOS = comActActSignDAO
            .listActivitySign(new Page(activitySignVO.getPageNum(), activitySignVO.getPageSize()), activitySignVO);
//        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        return R.ok(activitySignVOS);
    }
@@ -251,10 +294,78 @@
        return R.ok(activitySignVOS);
    }

    @Override
    public R getSignLists(ActivitySignVO activitySignVO) {
        return R.ok(comActActSignDAO.getSignLists(activitySignVO));
    }

    @Override
    public R pageActivityEvaluates(ComActActEvaluateVO comActActEvaluateVO) {
        IPage<ComActActEvaluateVO> comActActEvaluateVOIPage = comActActEvaluateDAO
                .pageActivityEvaluates(new Page(comActActEvaluateVO.getPageNum(), comActActEvaluateVO.getPageSize()), comActActEvaluateVO);
        return R.ok(comActActEvaluateVOIPage);
    }

    @Override
    public R getEvaluateLists(ComActActEvaluateVO comActActEvaluateVO) {
        return R.ok(comActActEvaluateDAO.getEvaluateLists(comActActEvaluateVO));
    }

    @Override
    public R pageActivityRegists(ComActActRegistVO comActActRegistVO) {
        IPage<ComActActRegistVO> comActActRegistVOIPage = comActActRegistDAO.pageActivityRegists(new Page(comActActRegistVO.getPageNum(), comActActRegistVO.getPageSize()), comActActRegistVO);
        return R.ok(comActActRegistVOIPage);
    }

    @Override
    public R getRegistLists(ComActActRegistVO comActActRegistVO) {
        return R.ok(comActActRegistDAO.getRegistLists(comActActRegistVO));
    }

    @Override
    public R getNoRegistLists(ComActActRegistVO comActActRegistVO) {
        return R.ok(comActActRegistDAO.getNoRegistLists(comActActRegistVO));
    }

    @Override
    public R activityStatistics(Long activityId) {
        ComActActivityStatisticsVO comActActivityStatisticsVO = comActActivityDAO.activityStatistics(activityId);
        if (comActActivityStatisticsVO != null) {
            if (comActActivityStatisticsVO.getSignTotal().equals(0)){
                comActActivityStatisticsVO.setSignTotalStr("不限");
                comActActivityStatisticsVO.setNoSignTotalStr("");
                comActActivityStatisticsVO.setSignPersent("");
            }else {
                comActActivityStatisticsVO.setSignTotalStr(String.valueOf(comActActivityStatisticsVO.getSignTotal()));
                comActActivityStatisticsVO.setNoSignTotalStr(String.valueOf(Integer.valueOf(comActActivityStatisticsVO.getSignTotalStr()) - comActActivityStatisticsVO.getReallySignTotal()));
                comActActivityStatisticsVO.setSignPersent(getPersent(comActActivityStatisticsVO.getReallySignTotal(),comActActivityStatisticsVO.getSignTotal()));
            }
            comActActivityStatisticsVO.setRegistPersent(getPersent(comActActivityStatisticsVO.getReallyRegistTotal(),comActActivityStatisticsVO.getRegistTotal()));
            comActActivityStatisticsVO.setEvaluatePersent(getPersent(comActActivityStatisticsVO.getReallyEvaluateTotal(),comActActivityStatisticsVO.getEvaluateTotal()));
        }
        return R.ok(comActActivityStatisticsVO);
    }

    @Override
    public R getPictureList(Long userId) {
        List<ComActActPictureVO> comActActPictureVOS = new ArrayList<>();
        List<ComActActPictureDO> comActActPictureDOS = comActActPictureDAO.selectList(new QueryWrapper<ComActActPictureDO>().lambda().
                eq(ComActActPictureDO::getUserId, userId));
        if (comActActPictureDOS != null && comActActPictureDOS.size() != 0) {
            comActActPictureDOS.forEach(comActActPictureDO -> {
                ComActActPictureVO comActActPictureVO = new ComActActPictureVO();
                BeanUtils.copyProperties(comActActPictureDO, comActActPictureVO);
                comActActPictureVOS.add(comActActPictureVO);
            });
        }
        return R.ok(comActActPictureVOS);
    }

    /**
     * 分页展示我的所有活动 时间倒序排列
     *
     * @param comActActivityVO 分页参数
     * @param comActActivityVO
     *            分页参数
     * @return 分页集合
     */
    @Override
@@ -277,7 +388,8 @@
    /**
     * 报名/取消报名社区活动
     *
     * @param signactivityVO 报名参数
     * @param signactivityVO
     *            报名参数
     * @return 报名 取消报名 结果
     */
    @Override
@@ -290,7 +402,8 @@
        int num=0;
        if (1==type) {
            R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(String.valueOf(userId));
            LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
            LoginUserInfoVO loginUserInfoVO =
                JSONObject.parseObject(JSONObject.toJSONString(userInfoR.getData()), LoginUserInfoVO.class);
            boolean userNotVolunteer = !(loginUserInfoVO.getIsVolunteer()==1);
            if(isVolunteer == 1 && userNotVolunteer){
                return R.fail("只有志愿者才能报名");
@@ -300,13 +413,15 @@
            ComActActivityDO actActivityDO = this.baseMapper.selectById(activityId);
            if(actActivityDO != null){
                //查询当前活动下参与志愿者/居民数量
                Integer count = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId,activityId)
                        .eq(ComActActSignDO::getIsVolunteer,isVolunteer));
                if(isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count && !actActivityDO.getVolunteerMax().equals(-1)){
                Integer count = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
                if (isVolunteer.equals(1) && actActivityDO.getVolunteerMax() <= count
                    && !actActivityDO.getVolunteerMax().equals(-1)) {
                    return R.fail("志愿者报名人数已满");
                }

                if(isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count && !actActivityDO.getParticipantMax().equals(-1)){
                if (isVolunteer.equals(0) && actActivityDO.getParticipantMax() <= count
                    && !actActivityDO.getParticipantMax().equals(-1)) {
                    return R.fail("居民报名人数已满");
                }
            }
@@ -324,7 +439,9 @@
                log.error(e.getMessage());
            }
        } else {
            num = comActActSignDAO.delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
            num = comActActSignDAO
                .delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId)
                    .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
        }
        if (num>0) {
            return R.ok();
@@ -335,22 +452,27 @@
    /**
     * 用户参加的所有社区活动
     *
     * @param userId 用户id
     * @param userId
     *            用户id
     * @return 活动列表
     */
    @Override
    public R listActivity(Long userId) {
        List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId));
        List<ComActActSignDO> comActActSignDOS = comActActSignDAO
            .selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comActActSignDOS)) {
            return R.fail();
        }
        List<Long> longs = comActActSignDOS.stream().map(comActActSignDO -> comActActSignDO.getActivityId()).collect(Collectors.toList());
        List<Long> longs = comActActSignDOS.stream().map(comActActSignDO -> comActActSignDO.getActivityId())
            .collect(Collectors.toList());
        List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs);
        List<ComActActivityVO>comActActivityVOS=new ArrayList<>();
        comActActivityDOS.forEach(comActActivityDO -> {
            ComActActivityVO comActActivityVO=new ComActActivityVO();
            BeanUtils.copyProperties(comActActivityDO,comActActivityVO);
            List<ComActActSignDO> collect = comActActSignDOS.stream().filter(comActActSignDO -> comActActSignDO.getActivityId().equals(comActActivityVO.getId())).limit(1).collect(Collectors.toList());
            List<ComActActSignDO> collect = comActActSignDOS.stream()
                .filter(comActActSignDO -> comActActSignDO.getActivityId().equals(comActActivityVO.getId())).limit(1)
                .collect(Collectors.toList());
            ComActActSignDO comActActSignDO = collect.get(0);
            Integer isVolunteer = comActActSignDO.getIsVolunteer();
            if (isVolunteer.intValue()==1) {
@@ -362,7 +484,9 @@
            if (status.intValue()==3) {
                comActActivityVO.setStatus(4);
            }
            comActActivityVO.setSingDate(comActActSignDOS.stream().filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId())).collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVO.setSingDate(comActActSignDOS.stream()
                .filter(comActActSignDO1 -> comActActSignDO1.getActivityId().equals(comActActivityVO.getId()))
                .collect(Collectors.toList()).get(0).getCreateAt());
            comActActivityVOS.add(comActActivityVO);
        });
        return R.ok(comActActivityVOS);
@@ -371,7 +495,8 @@
    /**
     * 查询志愿者参与的所有已经完成的活动
     *
     * @param phone 用户手机号
     * @param phone
     *            用户手机号
     * @return 所有活动集合
     */
    @Override
@@ -397,7 +522,8 @@
            comActActivityDOS.forEach(comActActivityDO -> {
                ComActActivityVO comActActivityVO=new ComActActivityVO();
                BeanUtils.copyProperties(comActActivityDO,comActActivityVO);
                List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, comActActivityDO.getId()));
                List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
                    .lambda().eq(ComActActSignDO::getActivityId, comActActivityDO.getId()));
                if (!ObjectUtils.isEmpty(comActActSignDOS)) {
                    List<ActivitySignVO> activitySignVOList=new ArrayList<>();
                    comActActSignDOS.forEach(comActActSignDO -> {
@@ -441,7 +567,8 @@
    /**
     * 社区后台分页查询社区活动
     *
     * @param comActActivityVO 查询参数
     * @param comActActivityVO
     *            查询参数
     * @return 返回结果
     */
    @Override
@@ -458,13 +585,24 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO);
        iPage.getRecords().forEach(vo ->{
            List<ComActActEvaluateDO> comActActEvaluateDOList = comActActEvaluateDAO
                    .selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, vo.getId()));
            if (comActActEvaluateDOList != null && comActActEvaluateDOList.size() != 0) {
                //总星级
                int starNum = comActActEvaluateDOList.stream().mapToInt(ComActActEvaluateDO::getStarLevel).sum();
                //评分星级=总星级/总评价人数
                vo.setEvaluateLevel(Double.valueOf(starNum/comActActEvaluateDOList.size()));
            }
        });
        return R.ok(iPage);
    }

    /**
     * 首页图表数据汇总
     *
     * @param communityId 社区id
     * @param communityId
     *            社区id
     * @return 图表数据 IndexDataVO
     */
    @Override
@@ -476,9 +614,10 @@
        String s=comActActivityDAO.selectCommunityGovernanceTrendsVO(communityId);
        List<String>y= Arrays.asList(s.split(","));
        communityGovernanceTrendsVO.setY(y);
        communityGovernanceTrendsVO.setX(Arrays.asList(new String[]{"一起议","微心愿","随手拍","社区活动"}));
        communityGovernanceTrendsVO.setX(Arrays.asList("一起议", "微心愿", "随手拍", "社区活动"));
        dates.forEach(date -> {
            CommunityActivitiesVO communityActivitiesVO=comActActivityDAO.selectCommunityActivitiesVO(communityId,date);
            CommunityActivitiesVO communityActivitiesVO =
                comActActivityDAO.selectCommunityActivitiesVO(communityId, date);
            communityActivitiesVO.setDate(date);
            communityActivitiesVOS.add(communityActivitiesVO);
        });
@@ -494,7 +633,8 @@
                new Page(actActivityListDTO.getPageNum(),actActivityListDTO.getPageSize()),actActivityListDTO);
        if(!actActivityListVOIPage.getRecords().isEmpty()){
            actActivityListVOIPage.getRecords().forEach(actActivityListVO -> {
                ActActivityListVO activityListVO = comActActivityDAO.getScreenActActivityPeopleCount(actActivityListVO.getId());
                ActActivityListVO activityListVO =
                    comActActivityDAO.getScreenActActivityPeopleCount(actActivityListVO.getId());
                if(activityListVO != null){
                    actActivityListVO.setParticipantCount(activityListVO.getParticipantCount());
                    actActivityListVO.setVolunteerCount(activityListVO.getVolunteerCount());
@@ -506,11 +646,13 @@

    @Override
    public R getActActivityPeopleList(ScreenActActivityPeopleListDTO activityPeopleListDTO){
        return R.ok(comActActSignDAO.getActActivityPeopleList(new Page(activityPeopleListDTO.getPageNum(),activityPeopleListDTO.getPageSize()),activityPeopleListDTO));
        return R.ok(comActActSignDAO.getActActivityPeopleList(
            new Page(activityPeopleListDTO.getPageNum(), activityPeopleListDTO.getPageSize()), activityPeopleListDTO));
    }

    /**
     * 获取最近七天的时间
     * 
     * @return
     */
    private List<Date> getServenDays() {
@@ -523,15 +665,14 @@
        return dates;
    }


    /**
     * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
     */
    @Override
    public R timedTaskActivityNotice(){
        //查询所有即将开始的活动
        List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda()
                .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1))
        List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>()
            .lambda().le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(), 1))
                .ge(ComActActivityDO::getBeginAt,new Date()));
        if(!actActivityList.isEmpty()){
            WxXCXTempSend util = new WxXCXTempSend();
@@ -539,18 +680,18 @@
                String accessToken = util.getAppAccessToken();
                actActivityList.forEach(actActivity -> {
                    //查询报名活动人员列表
                    List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>().lambda()
                            .eq(ComActActSignDO::getActivityId,actActivity.getId()));
                    List<ComActActSignDO> actSignList = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>()
                        .lambda().eq(ComActActSignDO::getActivityId, actActivity.getId()));
                    actSignList.forEach(actSign -> {
                        //查询用户openId
                        Map<String,String> map = comActActSignDAO.getUserOpenId(actSign.getUserId());
                        if(map != null){
                            String openid = map.get("openid");
                            //推送消息
                            WxUtil.sendSubscribeHDJJKS(openid,accessToken,actActivity.getActivityName()
                                    , com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt()
                                            ,com.panzhihua.common.utlis.DateUtils.ymdhms_format),actActivity.getActivityAddr()
                                    ,actSignList.size()+"");
                            WxUtil.sendSubscribeHDJJKS(openid, accessToken, actActivity.getActivityName(),
                                com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt(),
                                    com.panzhihua.common.utlis.DateUtils.ymdhms_format),
                                actActivity.getActivityAddr(), actSignList.size() + "");
                        }

                    });
@@ -563,4 +704,62 @@
        return R.ok();
    }

    private String getPersent(int x, int y){
        if (y == 0) {
            return "";
        }
        if (x == 0) {
            return "0.00%";
        }
        double d1 = x * 1.0;
        double d2 = y * 1.0;
        DecimalFormat decimalFormat = new DecimalFormat("##.00%");
        return decimalFormat.format(d1 / d2);
    }

    /**
     * 用户签到
     *
     * @param comActActRegistVO 签到参数
     * @return 签到结果
     */
    @Override
    public R activitySignIn(ComActActRegistVO comActActRegistVO) {
        Long activityId = comActActRegistVO.getActivityId();
        Long userId = comActActRegistVO.getUserId();
        String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
        if (stringRedisTemplate.hasKey(activitySignInKey)) {
            return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
        }
        ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
        comActActRegistDO.setActivityId(activityId);
        comActActRegistDO.setUserId(userId);
        comActActRegistDO.setIsVolunteer(comActActRegistVO.getIsVolunteer());
        comActActRegistDO.setCreateAt(new Date());
        int result = comActActRegistDAO.insert(comActActRegistDO);
        if (result > 0) {
            ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
            opsForValue.set(activitySignInKey, "", 1800L, TimeUnit.SECONDS);
        }
        return R.ok();
    }

    /**
     *用户签到记录列表
     *
     * @param userId 用id
     * @return 用户签到列表
     */
    @Override
    public R listSignInActivity(Long userId) {
        List<ComActActRegistDO> comActActRegistDOS = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>()
                .lambda().eq(ComActActRegistDO::getUserId, userId));
        ArrayList<ComActActRegistVO> comActActRegistVOS = new ArrayList<>();
        comActActRegistDOS.forEach(comActActRegistDO -> {
            ComActActRegistVO comActActRegistVO = new ComActActRegistVO();
            BeanUtils.copyProperties(comActActRegistDO, comActActRegistVO);
            comActActRegistVOS.add(comActActRegistVO);
        });
        return R.ok(comActActRegistVOS);
    }
}