6.9新增登录失败冻结逻辑

liujie

2025-06-09 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb

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

@@ -4,33 +4,28 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;

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;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -108,7 +103,7 @@
@Slf4j
@RestController
@RequestMapping("/")
public class CommunityApi {
public class CommunityApi extends BaseController {
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
@@ -157,6 +152,12 @@
    private ComActMicroWishOperationRecordService wishOperationRecordService;
    @Resource
    private ComActActEvaluateDAO comActActEvaluateDAO;
    @Resource
    private ComActActivityInviteService comActActivityInviteService;
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Resource
    private AutomessageSysUserService automessageSysUserService;

    /**
     * 新增社区活动
@@ -283,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);
                });
@@ -361,6 +364,7 @@
            });
            comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
        }
        //
        //活动评价
        IPage<ComActActEvaluateVO> comActActEvaluatePage = comActActEvaluateDAO.getEvaluateListPage(new Page(pageNum,pageSize),id);
        comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords());
@@ -414,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) {
@@ -424,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);
                    }
                }
            }
@@ -623,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();
    }

    /**
@@ -679,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) {
@@ -770,6 +930,17 @@
    }

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

    /**
     * 城管安排
     *
     * @param comActEasyPhotoVO
@@ -787,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);
    }

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

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

    /**
     * 心愿详情
     *
@@ -855,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);
    }

    /**
@@ -1202,8 +1405,8 @@
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    public R listBuildType() {
        return comMngStructOtherBuildService.listBuildType();
    public R listBuildType(@RequestParam("communityId")Long communityId) {
        return comMngStructOtherBuildService.listBuildType(communityId);
    }

    /**
@@ -1227,6 +1430,15 @@
     */
    @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);
    }

@@ -1243,7 +1455,7 @@

    /**
     * 删除志愿者
     *
     * 
     * @param comMngVolunteerMngVO
     *            手机号
     * @return 删除结果
@@ -1255,7 +1467,7 @@

    /**
     * 编辑志愿者
     *
     * 
     * @param comMngVolunteerMngVO
     *            编辑内容
     * @return 编辑结果
@@ -1267,7 +1479,7 @@

    /**
     * 分页展示志愿者
     *
     * 
     * @param comMngVolunteerMngVO
     *            查询参数
     * @return 分页集合返回
@@ -1279,7 +1491,7 @@

    /**
     * 分页展示志愿者审核
     *
     * 
     * @param comMngVolunteerMngVO
     *            查询参数
     * @return 查询结果
@@ -1291,7 +1503,7 @@

    /**
     * 志愿者审核详情
     *
     * 
     * @param id
     *            主键
     * @return 详情
@@ -1303,7 +1515,7 @@

    /**
     * 志愿者审核
     *
     * 
     * @param comMngVolunteerMngVO
     *            审核操作
     * @return 审核结果
@@ -1315,7 +1527,7 @@

    /**
     * 删除志愿者审核
     *
     * 
     * @param comMngVolunteerMngVO
     *            主键
     * @return 删除结果
@@ -1327,7 +1539,7 @@

    /**
     * 查询区域
     *
     * 
     * @param comActVO
     *            登录人的经纬度、或者指定区域的社区
     * @return 社区集合
@@ -1339,7 +1551,7 @@

    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     *
     * 
     * @param userPhoneVO
     *            新旧手机号
     * @return 修改结果
@@ -1351,7 +1563,7 @@

    /**
     * 房屋地址下拉列表
     *
     * 
     * @param parentCode
     *            父级编码
     * @param areaId
@@ -1373,7 +1585,7 @@

    /**
     * 新增房屋
     *
     * 
     * @param comMngStructHouseVO
     *            房屋信息
     * @return 新增结果
@@ -1391,7 +1603,7 @@

    /**
     * 查询小区
     *
     * 
     * @param communityId
     *            社区id
     * @return 小区集合
@@ -1403,20 +1615,21 @@

    /**
     * 用户参加的所有社区活动
     *
     * 
     * @param userId
     *            用户id
     * @return 活动列表
     */
    @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);
    }

    /**
     * 用户确认心愿
     *
     * 
     * @param comActMicroWishVO
     *            用户评价
     * @return 确认结果
@@ -1428,7 +1641,7 @@

    /**
     * 建筑类型
     *
     * 
     * @param communityId
     *            社区id
     * @return 建筑集合
@@ -1440,7 +1653,7 @@

    /**
     * 增加删除建筑类型
     *
     * 
     * @param systemmanagementConfigVO
     *            操作内容
     * @return 操作结果
@@ -1457,7 +1670,7 @@

    /**
     * 社区详情
     *
     * 
     * @param communityId
     *            社区id
     * @return 社区详情
@@ -1469,7 +1682,7 @@

    /**
     * 小区详情
     *
     * 
     * @param areaId
     *            小区id
     * @return 小区信息
@@ -1481,7 +1694,7 @@

    /**
     * 分页查询社区
     *
     * 
     * @param pageComActDTO
     *            查询参数
     * @return 分页集合
@@ -1493,7 +1706,7 @@

    /**
     * 志愿者详情
     *
     * 
     * @param id
     *            主键
     * @return 志愿者
@@ -1513,7 +1726,7 @@

    /**
     * 查询平台所有的社区
     *
     * 
     * @return 社区集合 按照创建顺序倒序排列
     */
    @PostMapping("listcommunityall")
@@ -1523,7 +1736,7 @@

    /**
     * 社区管理后台数据看板 代办事件
     *
     * 
     * @param communityId
     *            社区id
     * @param userId
@@ -1555,7 +1768,7 @@

    /**
     * 删除社区
     *
     * 
     * @param communityId
     *            社区id
     * @return 删除结果
@@ -1567,7 +1780,7 @@

    /**
     * 定时任务刷新社区动态置顶状态
     *
     * 
     * @return 刷新结果
     */
    @PostMapping("timedtaskdynistopping")
@@ -1577,7 +1790,7 @@

    /**
     * 定时任务刷新社区动态发布状态
     *
     * 
     * @return
     */
    @PostMapping("timedtaskdynstatus")
@@ -1587,7 +1800,7 @@

    /**
     * 定时任务查询所有要取消的社区活动
     *
     * 
     * @return 社区活动集合
     */
    @PostMapping("timedtaskactactivity")
@@ -1597,7 +1810,7 @@

    /**
     * 定时任务刷新社区活动的各个状态 除取消外
     *
     * 
     * @return 更新结果
     */
    @PostMapping("timedtaskactactivityall")
@@ -1607,7 +1820,7 @@

    /**
     * 定时任务刷新微心愿的状态
     *
     * 
     * @return 更新结果
     */
    @PostMapping("timedtaskactmicrowish")
@@ -1617,7 +1830,7 @@

    /**
     * 其他建筑详情
     *
     * 
     * @param id
     *            主键id
     * @return 建筑内容
@@ -1629,7 +1842,7 @@

    /**
     * 编辑其他建筑
     *
     * 
     * @param comMngStructOtherBuildVO
     *            编辑内容
     * @return 编辑结果
@@ -1641,7 +1854,7 @@

    /**
     * 删除其他建筑
     *
     * 
     * @param id
     *            主键
     * @return 删除结果
@@ -1653,7 +1866,7 @@

    /**
     * 小程序分页查询随手拍
     *
     * 
     * @param comActEasyPhotoVO
     *            查询参数
     * @return 返回结果
@@ -1663,9 +1876,22 @@
        return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }


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

    /**
     * 随手拍评论分页查询
     *
     * 
     * @param pageComActEasyPhotoCommentDTO
     *            查询参数
     * @return 查询结果
@@ -1676,8 +1902,20 @@
    }

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

    /**
     * 评论点赞/取消点赞
     * 
     * @param comActEasyPhotoCommentUserDTO
     *            操作
     * @return 操作结果
@@ -1689,7 +1927,7 @@

    /**
     * 随手拍--评论--新增评论
     *
     * 
     * @param comActEasyPhotoCommentDTO
     *            新增内容
     * @return 新增结果
@@ -1701,7 +1939,7 @@

    /**
     * 查询城市下属所有地区列表
     *
     * 
     * @param cityAdcode
     *            城市地址编码
     * @return 地区列表
@@ -1713,7 +1951,7 @@

    /**
     * 首页图表数据汇总
     *
     * 
     * @param communityId
     *            社区id
     * @return 图表数据 IndexDataVO
@@ -1725,7 +1963,7 @@

    /**
     * 选择导入的小区
     *
     * 
     * @param param
     *            小区名字 模糊查询
     * @param communityId
@@ -1739,7 +1977,7 @@

    /**
     * 检查小区是否已经批量设置过房屋并且返回小区房屋门号规则
     *
     * 
     * @param id
     *            小区id
     * @return ComMngStructAreaVO
@@ -1751,7 +1989,7 @@

    /**
     * 新增留言
     *
     * 
     * @param comActMessageVO
     *            新增留言信息
     * @return 发布结果
@@ -1764,7 +2002,7 @@

    /**
     * 我发的留言
     *
     * 
     * @return 结果集合
     */
    @PostMapping("pagemymessage")
@@ -1774,7 +2012,7 @@

    /**
     * 发给我的留言
     *
     * 
     * @return 结果集合
     */
    @PostMapping("pagesendtomemessage")
@@ -1784,7 +2022,7 @@

    /**
     * 根据id查询留言集合
     *
     * 
     * @return 结果集合
     */
    @PostMapping("pagemessagebyuser")
@@ -1794,7 +2032,7 @@

    /**
     * 社区留言
     *
     * 
     * @return 结果集合
     */
    @PostMapping("pagemycommunitymessage")
@@ -1804,7 +2042,7 @@

    /**
     * 新增留言回复
     *
     * 
     * @param comActMessageBackVO
     *            新增留言回复信息
     * @return 发布结果
@@ -1839,7 +2077,7 @@

    /**
     * 导出房屋信息
     *
     * 
     * @param areaId
     * @return
     */
@@ -1850,7 +2088,7 @@

    /**
     * 查看用户问卷调查详细
     *
     * 
     * @param userId
     *            用户ID
     * @param questId
@@ -1864,7 +2102,7 @@

    /**
     * 查看问卷调查详细
     *
     * 
     * @param questId
     *            问卷ID
     * @return 用户问卷调查详细
@@ -1886,7 +2124,7 @@

    /**
     * 小程序-问卷调查详情
     *
     * 
     * @param userId
     *            用户id
     * @param questId
@@ -1900,7 +2138,7 @@

    /**
     * 社区后台-查询问卷调查详情
     *
     * 
     * @param questId
     *            问卷id
     * @return 问卷调查详情
@@ -1912,7 +2150,7 @@

    /**
     * 新增社区问卷
     *
     * 
     * @param questnaireVO
     * @return
     */
@@ -1923,7 +2161,7 @@

    /**
     * 小程序-社区问卷列表
     *
     * 
     * @param pageQuestnaireDTO
     *            请求参数
     * @return 社区问卷列表
@@ -1935,7 +2173,7 @@

    /**
     * 社区后台-社区问卷列表
     *
     * 
     * @param pageQuestnaireDTO
     *            请求参数
     * @return 社区问卷列表
@@ -1947,7 +2185,7 @@

    /**
     * 编辑问卷——问卷、题目、选项
     *
     * 
     * @param questnaireVO
     * @return
     */
@@ -1958,7 +2196,7 @@

    /**
     * 修改问卷状态
     *
     * 
     * @param editComActQuestnaireVo
     * @return
     */
@@ -1969,7 +2207,7 @@

    /**
     * 删除问卷 ——隐藏
     *
     * 
     * @param questId
     *            调查问卷Id
     * @return
@@ -1982,7 +2220,7 @@

    /**
     * 查看用户问卷调查统计信息
     *
     * 
     * @param questId
     *            问卷ID
     * @return 用户问卷调查统计信息
@@ -2016,7 +2254,7 @@

    /**
     * 社区问卷回答用户分页
     *
     * 
     * @param pageQuestnaireAnswerDTO
     * @return 分页数据
     */
@@ -2035,7 +2273,7 @@

    /**
     * 小程序-用户弹窗添加不在提醒接口
     *
     * 
     * @param questId
     *            问卷id
     * @param userId
@@ -2049,7 +2287,7 @@

    /**
     * 删除微心愿
     *
     * 
     * @param id
     * @return
     */
@@ -2060,7 +2298,7 @@

    /**
     * 新增高龄认证
     *
     * 
     * @param eldersAuthAddDTO
     * @return 新增结果
     */
@@ -2071,7 +2309,7 @@

    /**
     * 修改高龄认证
     *
     * 
     * @param eldersAuthEditDTO
     * @return 维护结果
     */
@@ -2082,7 +2320,7 @@

    /**
     * 分页查找高龄认证
     *
     * 
     * @param pageEldersAuthDTO
     * @return 维护结果
     */
@@ -2093,7 +2331,7 @@

    /**
     * 删除高龄认证
     *
     * 
     * @param EldersAuthDeleteDTO
     * @return 平台用户信息
     */
@@ -2104,7 +2342,7 @@

    /**
     * 查询高龄认证详细信息
     *
     * 
     * @param id
     *            高龄认证 id
     * @return 查找结果
@@ -2206,7 +2444,7 @@

    /**
     * 新增高龄认证社区反馈
     *
     * 
     * @param {classNameFirstLower}AddDTO
     *            添加高龄认证社区反馈传递对象
     * @return 新增结果
@@ -2243,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());
@@ -2257,7 +2495,7 @@

    /**
     * 查询导出高龄老人
     *
     * 
     * @param pageEldersAuthDTO
     * @return
     */
@@ -2268,7 +2506,7 @@

    /**
     * 设置社区认证方式
     *
     * 
     * @param communityId
     *            社区ID
     * @param type
@@ -2282,7 +2520,7 @@

    /**
     * 随手拍活动定时任务
     *
     * 
     * @return 执行结果
     */
    @PostMapping("timeTaskEasyPhotoActivity")
@@ -2292,7 +2530,7 @@

    /**
     * 社区随手拍列表统计
     *
     * 
     * @param communityId
     *            社区id
     * @return 统计结果
@@ -2304,12 +2542,12 @@

    /**
     * 综治后台-查询社区列表
     *
     * 
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists() {
        return comActService.getCommunityLists();
        return comActService.getCommunityLists(this.getAppId());
    }

    /**
@@ -2318,13 +2556,13 @@
     * @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);
    }

    /**
     * 随手拍发放奖励
     *
     * 
     * @param grantRewardDTO
     *            请求参数
     * @return 发放结果
@@ -2336,7 +2574,7 @@

    /**
     * 获取最新活动和用户最新收益
     *
     * 
     * @param userId
     *            用户id
     * @param communityId
@@ -2362,9 +2600,13 @@
        return comActEasyPhotoService.getUserReward(userId, communityId);
    }

    @PostMapping("easyphoto/getUserRewardsNew")
    public R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
        return comActEasyPhotoService.getUserRewardNew(userId, communityId);
    }
    /**
     * 读取用户随手拍奖励
     *
     * 
     * @param userId
     *            用户id
     * @return 读取结果
@@ -2384,7 +2626,7 @@

    /**
     * 问卷调查统计汇总
     *
     * 
     * @param summaryDTO
     *            请求参数
     * @return 统计汇总
@@ -2396,7 +2638,7 @@

    /**
     * 问卷调查统计汇总导出数据查询
     *
     * 
     * @param questId
     *            调查问卷id
     * @return 调查统计汇总导出数据
@@ -2408,7 +2650,7 @@

    /**
     * 问卷调查统计汇总表头统计
     *
     * 
     * @param questId
     *            调查问卷id
     * @return 问卷调查统计汇总表头统计数据
@@ -2437,7 +2679,7 @@

    /**
     * 小程序-新增问卷调查浏览数量
     *
     * 
     * @param questId
     *            问卷调查id
     * @return 增加结果
@@ -2449,7 +2691,7 @@

    /**
     * 社区后台-切换随手拍公示状态
     *
     * 
     * @param comActEasyPhotoVO
     *            请求参数
     * @return 切换结果
@@ -2461,7 +2703,7 @@

    /**
     * 查询社区待处理随手拍id集合
     *
     * 
     * @param communityId
     *            社区id
     * @return 社区待处理随手拍id集合
@@ -2558,4 +2800,171 @@
                                  @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngVolunteerMngService.importVolunteerAdmin(list,communityId,userId);
    }

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
     * @author manailin
     * @date 2022/2/17 10:09
     */
    @GetMapping("act/getActBelongRegionCode")
    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();
    }

}