6.9新增登录失败冻结逻辑

liujie

2025-06-09 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -8,6 +8,19 @@

import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -20,27 +33,62 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActPrizeVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;

import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
@@ -55,7 +103,7 @@
@Slf4j
@RestController
@RequestMapping("/")
public class CommunityApi {
public class CommunityApi extends BaseController {
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
@@ -104,6 +152,12 @@
    private ComActMicroWishOperationRecordService wishOperationRecordService;
    @Resource
    private ComActActEvaluateDAO comActActEvaluateDAO;
    @Resource
    private ComActActivityInviteService comActActivityInviteService;
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Resource
    private AutomessageSysUserService automessageSysUserService;

    /**
     * 新增社区活动
@@ -230,10 +284,12 @@
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    Integer volunteerMax = comActActivityVO1.getVolunteerMax();
                    if (volunteerMax.intValue() != 0) {
                        comActActivityVO1.setType(1);
                    } else {
                        comActActivityVO1.setType(2);
                    if(comActActivityVO1.getType()==null){
                        if (volunteerMax.intValue() != 0) {
                            comActActivityVO1.setType(1);
                        } else {
                            comActActivityVO1.setType(2);
                        }
                    }
                    fillActivitySignList(id, comActActivityVO1);
                });
@@ -246,7 +302,7 @@

    /**
     * 社区后台分页查询社区活动
     * 
     *
     * @param comActActivityVO
     *            查询参数
     * @return 返回结果
@@ -308,6 +364,7 @@
            });
            comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
        }
        //
        //活动评价
        IPage<ComActActEvaluateVO> comActActEvaluatePage = comActActEvaluateDAO.getEvaluateListPage(new Page(pageNum,pageSize),id);
        comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords());
@@ -361,7 +418,7 @@
                    }
                }
                List<ActivitySignVO> collect = activitySignVOS.stream()
                    .filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 1).collect(toList());
                    .filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 3).collect(toList());
                if (!ObjectUtils.isEmpty(collect)) {
                    int size = collect.size();
                    if (size >= 6) {
@@ -371,13 +428,23 @@
                    }
                }
                List<ActivitySignVO> collect1 = activitySignVOS.stream()
                    .filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 0).collect(toList());
                    .filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 1).collect(toList());
                if (!ObjectUtils.isEmpty(collect1)) {
                    int size = collect1.size();
                    if (size >= 6) {
                        comActActivityVO.setActivitySignVOList(collect1.subList(0, 6));
                    } else {
                        comActActivityVO.setActivitySignVOList(collect1);
                    }
                }
                List<ActivitySignVO> collect2 = activitySignVOS.stream()
                        .filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 2).collect(toList());
                if (!ObjectUtils.isEmpty(collect2)) {
                    int size = collect2.size();
                    if (size >= 6) {
                        comActActivityVO.setActivityPbList(collect2.subList(0, 6));
                    } else {
                        comActActivityVO.setActivityPbList(collect2);
                    }
                }
            }
@@ -570,33 +637,153 @@
     */
    @PostMapping("adddynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        ComActDynDO comActDynDO = new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        boolean save = comActDynService.save(comActDynDO);
        if (save) {
            // 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;
            if (b) {
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda()
                    .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
                if (!ObjectUtils.isEmpty(list)) {
                    int size = list.size();
                    if (size == 4) {
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt))
                            .collect(toList());
                        ComActDynDO comActDynDO1 = collect.get(0);
                        comActDynDO1.setIsTopping(0);
                        boolean update = comActDynService.updateById(comActDynDO1);
                        if (!update) {
                            return R.fail("修改置顶状态失败");

        if(comActDynVO==null)
        {
            return R.fail("参数不能为空");
        }

        if(comActDynVO.getCommunityList()!=null && comActDynVO.getCommunityList().size()>0 )
        {
            for(String communityId:comActDynVO.getCommunityList())
            {
                ComActDynDO comActDynDO = new ComActDynDO();
                BeanUtils.copyProperties(comActDynVO, comActDynDO);

                comActDynDO.setCommunityId(communityId);

                switch (comActDynVO.getType())
                {
                    //74
                    case "党务公开":
                        comActDynDO.setType("74");
                        break;
                    //75
                    case "服务公开":
                        comActDynDO.setType("75");
                        break;
                    //77
                    case "财务公开":
                        comActDynDO.setType("77");
                        break;
                    case "项目公开":
                        comActDynDO.setType("1559820224499318786");
                        break;
                    //
                    case "资金公开":
                    case "资产公开":
                    case "资源公开":
                    case "村集体经济组织项目":
                        comActDynDO.setType(comActDynService.getTypeId(communityId,comActDynVO.getType()));
                        break;
                }

                if(StringUtils.isEmpty(comActDynVO.getType()))
                {
                    return R.fail("分类选择错误");
                }


                boolean save = comActDynService.save(comActDynDO);
                if (save) {
                    if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){
                        comActDynVO.setId(comActDynDO.getId());
                        comActDynVO.setCommunityId(communityId);
                        rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
                    }
                    // 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
                    Integer isTopping = comActDynVO.getIsTopping();
                    boolean b = isTopping.intValue() == 1;
                    if (b) {
                        List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda()
                                .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, communityId));
                        if (!ObjectUtils.isEmpty(list)) {
                            int size = list.size();
                            if (size == 4) {
                                List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt))
                                        .collect(toList());
                                ComActDynDO comActDynDO1 = collect.get(0);
                                comActDynDO1.setIsTopping(0);
                                boolean update = comActDynService.updateById(comActDynDO1);
                                if (!update) {
                                    return R.fail("修改置顶状态失败");
                                }
                            }
                        }
                    }
                }
            }
            return R.ok();

//            ComActDynDO comActDynDO = new ComActDynDO();
//            BeanUtils.copyProperties(comActDynVO, comActDynDO);
//
//            boolean save = comActDynService.save(comActDynDO);
//            if (save) {
//                if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){
//                    comActDynVO.setId(comActDynDO.getId());
//                    rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
//                }
//                // 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
//                Integer isTopping = comActDynVO.getIsTopping();
//                boolean b = isTopping.intValue() == 1;
//                if (b) {
//                    List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda()
//                            .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
//                    if (!ObjectUtils.isEmpty(list)) {
//                        int size = list.size();
//                        if (size == 4) {
//                            List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt))
//                                    .collect(toList());
//                            ComActDynDO comActDynDO1 = collect.get(0);
//                            comActDynDO1.setIsTopping(0);
//                            boolean update = comActDynService.updateById(comActDynDO1);
//                            if (!update) {
//                                return R.fail("修改置顶状态失败");
//                            }
//                        }
//                    }
//                }
//                return R.ok();
//            }

        }
        else
        {
            ComActDynDO comActDynDO = new ComActDynDO();
            BeanUtils.copyProperties(comActDynVO, comActDynDO);

            comActDynDO.setCommunityId(comActDynVO.getCommunityId());
            boolean save = comActDynService.save(comActDynDO);
            if (save) {
                if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){
                    comActDynVO.setId(comActDynVO.getId());
                    comActDynVO.setCommunityId(comActDynVO.getCommunityId());
                    rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
                }
                // 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
                Integer isTopping = comActDynVO.getIsTopping();
                boolean b = isTopping.intValue() == 1;
                if (b) {
                    List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda()
                            .eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
                    if (!ObjectUtils.isEmpty(list)) {
                        int size = list.size();
                        if (size == 4) {
                            List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt))
                                    .collect(toList());
                            ComActDynDO comActDynDO1 = collect.get(0);
                            comActDynDO1.setIsTopping(0);
                            boolean update = comActDynService.updateById(comActDynDO1);
                            if (!update) {
                                return R.fail("修改置顶状态失败");
                            }
                        }
                    }
                }
            }
            return R.ok();
        }
        return R.fail();
    }

    /**
@@ -626,6 +813,32 @@
        // comActDynVO.setCover(comActDynDO.getCover());
        // }
        BeanUtils.copyProperties(comActDynVO, comActDynDO);

        switch (comActDynVO.getType())
        {
            //74
            case "党务公开":
                comActDynDO.setType("74");
                break;
            //75
            case "服务公开":
                comActDynDO.setType("75");
                break;
            //77
            case "财务公开":
                comActDynDO.setType("77");
                break;
            case "项目公开":
                comActDynDO.setType("1559820224499318786");
                break;
            //
            case "资金公开":
            case "资产公开":
            case "资源公开":
            case "村集体经济组织项目":
                comActDynDO.setType(comActDynService.getTypeId(comActDynDO.getCommunityId(),comActDynVO.getType()));
                break;
        }

        boolean update = comActDynService.updateById(comActDynDO);
        if (update) {
@@ -717,6 +930,17 @@
    }

    /**
     * 分页查询随手拍  浪潮专用
     *
     *            查询参数
     * @return 心愿列表
     */
    @GetMapping("pageEasyPhotoAdminLC")
    public R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize) {
        return comActEasyPhotoService.pageEasyPhotoAdminLC(pageNum,pageSize);
    }

    /**
     * 城管安排
     *
     * @param comActEasyPhotoVO
@@ -734,6 +958,20 @@
    @PostMapping("exportEasyPhoto")
    public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO) {
        return comActEasyPhotoService.export(exportEasyPhotoDTO);
    }

    /**
     * 随手拍详情-脱敏
     *
     * @param id
     *            随手拍主键
     * @param userId
     *            登录用户
     * @return 详情内容
     */
    @PostMapping("detaileasyphotodesensitize")
    public R detailEasyPhotoDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActEasyPhotoService.detailEasyPhotoDesensitize(id, userId);
    }

    /**
@@ -790,6 +1028,11 @@
        return comActMicroWishService.pageMicroWishApplets(comActMicroWishVO);
    }

    @PostMapping("pagemicrowish/appletsDesensitize")
    public R pageMicroWishAppletsDesensitize(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        return comActMicroWishService.pageMicroWishAppletsDesensitize(comActMicroWishVO);
    }

    /**
     * 心愿详情
     *
@@ -802,6 +1045,19 @@
    @PostMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActMicroWishService.detailMicroWish(id, userId);
    }
    /**
     * 心愿详情 - 脱敏
     *
     * @param id
     *            查询主键
     * @param userId
     *            登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowishdesensitize")
    public R detailMicroWishDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
        return comActMicroWishService.detailMicroWishDesensitize(id, userId);
    }

    /**
@@ -854,7 +1110,7 @@

    /**
     * 查询随手拍是否有活动
     * 
     *
     * @return 活动详情
     */
    @PostMapping("getEasyPhotoActivity")
@@ -1145,17 +1401,17 @@

    /**
     * 查询所有建筑类型
     * 
     *
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    public R listBuildType() {
        return comMngStructOtherBuildService.listBuildType();
    public R listBuildType(@RequestParam("communityId")Long communityId) {
        return comMngStructOtherBuildService.listBuildType(communityId);
    }

    /**
     * 分页查询 其他建筑
     * 
     *
     * @param comMngStructOtherBuildVO
     *            分页查询参数
     * @return 查询结果
@@ -1167,19 +1423,28 @@

    /**
     * 增加志愿者
     * 
     *
     * @param comMngVolunteerMngVO
     *            志愿者信息
     * @return 增加结果
     */
    @PostMapping("addvolunteer")
    R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
        Long submitUserId = comMngVolunteerMngVO.getSubmitUserId();
        if (Objects.nonNull(submitUserId)) {
            //获取小程序用户信息
            R<LoginUserInfoVO> userInfoR = userService.getUserInfoByUserId(submitUserId.toString());
            LoginUserInfoVO userInfo = userInfoR.getData();
            if (Objects.nonNull(userInfo)) {
                comMngVolunteerMngVO.setIdCard(userInfo.getIdCard());
            }
        }
        return comMngVolunteerMngService.addVolunteer(comMngVolunteerMngVO);
    }

    /**
     * 获取志愿者详情
     * 
     *
     * @param id
     * @return
     */
@@ -1357,8 +1622,9 @@
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId,
                          @RequestParam(value = "status", required = false) Integer status) {
        return comActActivityService.listActivity(userId, status);
                          @RequestParam(value = "status", required = false) Integer status,
                          @RequestParam(value = "type", required = false) Integer type) {
        return comActActivityService.listActivity(userId, status,type);
    }

    /**
@@ -1610,6 +1876,19 @@
        return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }


    /**
     * 小程序分页查询随手拍 脱敏
     *
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("pageeasyphotoappletsdesensitize")
    public R pageEasyPhotoAppletsDesensitize(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.pageEasyPhotoAppletsDesensitize(comActEasyPhotoVO);
    }

    /**
     * 随手拍评论分页查询
     * 
@@ -1620,6 +1899,18 @@
    @PostMapping("pagecomacteasyphotocomment")
    public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
        return comActEasyPhotoService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO);
    }

    /**
     * 随手拍评论分页查询 - 脱敏
     *
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("pagecomacteasyphotocommentdesensitize")
    public R pageComActEasyPhotoCommentDesensitize(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) {
        return comActEasyPhotoService.pageComActEasyPhotoCommentDesensitize(pageComActEasyPhotoCommentDTO);
    }

    /**
@@ -2190,7 +2481,7 @@
                try {
                    WxXCXTempSend util = new WxXCXTempSend();
                    R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(eldersAuthFeedbackAddDTO.getAreaCode(),5);
                    String accessToken = util.getAppAccessToken();
                    String accessToken = util.getAccessToken();
                    WxUtil.sendSubscribeRZSH(openid, accessToken, "高龄认证",
                        DateUtils.format(eldersAuthDO.getCreateAt(), DateUtils.ymdhms_format),
                        eldersAuthFeedbackAddDTO.getFeedBack(),sysTemplateConfigVO.getData().getTemplateId());
@@ -2256,7 +2547,7 @@
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists() {
        return comActService.getCommunityLists();
        return comActService.getCommunityLists(this.getAppId());
    }

    /**
@@ -2265,7 +2556,7 @@
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    public R getWestCommunityLists(@RequestParam("areaCode")String areaCode) {
    public R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode) {
        return comActService.getWestCommunityLists(areaCode);
    }

@@ -2309,6 +2600,10 @@
        return comActEasyPhotoService.getUserReward(userId, communityId);
    }

    @PostMapping("easyphoto/getUserRewardsNew")
    public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.getUserRewardNew(userId, communityId);
    }
    /**
     * 读取用户随手拍奖励
     * 
@@ -2493,8 +2788,22 @@
    }

    /**
     * 志愿者导入
     *
     * @param list        志愿者数据列表
     * @param communityId 社区id
     * @param userId      用户id
     * @return 导入结果
     */
    @PostMapping("/volunteer/import/admin")
    public R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
                                  @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngVolunteerMngService.importVolunteerAdmin(list,communityId,userId);
    }

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     * 
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
@@ -2505,4 +2814,157 @@
    public String getActBelongRegionCode(@RequestParam("communityId") Long communityId) {
        return comActActivityService.getActBelongRegionCode(communityId);
    }

    /**
     * 党员活动统计
     * @param communityId
     * @param year
     * @return
     */
    @GetMapping("activity/partyMemberCount")
    public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){
        return comActActivityService.partyMemberCount(communityId,year);
    }

    /**
     * 党员活动详情数据
     * @return
     */
    @PostMapping("activity/partyMemberDetail")
    public R partyMemberDetail(@RequestBody CommonPage commonPage){
        return comActActivityService.partyMemberDetail(commonPage);
    }


    /**
     * 导出党员活动详情数据
     * @return
     */
    @PostMapping("activity/exportPartyMemberDetail")
    public R exportPartyMemberDetail(@RequestBody CommonPage commonPage){
        return comActActivityService.exportPartyMemberDetail(commonPage);
    }

    /**
     * 批量删除活动
     * @param ids
     * @return
     */
    @PostMapping("batchDel")
    public R deleteActivities(@RequestBody List<Long> ids) {
        return R.ok(comActActivityService.removeByIds(ids));
    }

    /**
     * 获取人大代表反馈记录
     * @param id
     * @return
     */
    @GetMapping("dpc/feedback")
    public R getFeedbackList(@RequestParam("id") Long id) {
        return comActEasyPhotoService.getFeedbackList(id);
    }

    /**
     * 人大代表反馈随手拍
     * @param comActEasyPhotoVO
     * @return
     */
    @PostMapping("dpc/feedback")
    public R addEasyPhotoFeedbackForDpc(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.addEasyPhotoFeedbackForDpc(comActEasyPhotoVO);
    }

    /**
     * 活动邀请列表
     * @param pageActivityInviteDTO
     * @return
     */
    @PostMapping("activity/invite/list")
    public R pageActivityInviteList(@RequestBody PageActivityInviteDTO pageActivityInviteDTO) {
        return comActActivityInviteService.pageActivityInviteList(pageActivityInviteDTO);
    }

    /**
     * 添加邀请人员
     * @param list
     * @return
     */
    @PostMapping("activity/invite/add")
    public R activityInviteAdd(@RequestBody List<ActivityInviteDTO> list) {
        return comActActivityInviteService.activityInviteAdd(list);
    }

    /**
     * 删除邀请人员
     * @param id
     * @return
     */
    @DeleteMapping("activity/invite/delete")
    public R activityInviteDelete(@RequestParam("id") Long id) {
        return comActActivityInviteService.activityInviteDelete(id);
    }

    /**
     * 根据id查询重复的社区id集合
     * @param id
     * @return
     */
    @GetMapping("selectCommunityIds")
    public R selectCommunityIds(@RequestParam("id") Long id){
        return comActService.selectIds(id);
    }


    /**
     * 通过id查询用户
     * @param id
     * @return
     */
    @GetMapping("selectAutomessageSysUserById")
    public R selectAutomessageSysUserById(@RequestParam("id") Long id){
        return automessageSysUserService.selectAutomessageSysUserById(id);
    }

    /**
     * 根据id查询重复的社区id集合
     * @return
     */
    @GetMapping("selectBasicData")
    public R selectBasicData(){
        return comActService.selectBasicData();
    }

    /**
     * 统计在职干部特长
     * @return
     */
    @GetMapping("statisticsPbMemberType")
    public R statisticsPbMemberType(){
        return comActService.statisticsPbMemberType();
    }

    /**
     * 统计单位
     * @return
     */
    @GetMapping("selectUnitByNatureName")
    public R selectUnitByNatureName(){
        return comActService.selectUnitByNatureName();
    }

    /**
     * 大屏-社区活动分页
     * @return
     */
    @PostMapping("pageActivityBigScreen")
    public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO){
        return comActActivityService.pageActivityBigScreen(pageBaseDTO);
    }

    @GetMapping("easyphoto/selectStatisticsPhoto")
    public R selectStatisticsPhoto() {
        return comActEasyPhotoService.selectStatisticsPhoto();
    }

}