java/zhihuishenqu.git

			@@ -1,17 +1,77 @@
			package com.panzhihua.service_community.api;

			import cn.hutool.core.util.IdcardUtil;
			import static java.util.stream.Collectors.toList;

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.util.*;

			import javax.annotation.Resource;

			import com.panzhihua.common.controller.BaseController;
			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.*;

			import com.alibaba.fastjson.JSONArray;
			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.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;
			@@ -19,26 +79,19 @@
			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.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;
			import lombok.extern.slf4j.Slf4j;
			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.*;

			import javax.annotation.Resource;
			import java.text.SimpleDateFormat;
			import java.util.ArrayList;
			import java.util.Comparator;
			import java.util.Date;
			import java.util.List;
			import java.util.stream.Collectors;

			/**
			* @program: springcloud_k8s_panzhihuazhihuishequ
			@@ -49,7 +102,11 @@
			@Slf4j
			@RestController
			@RequestMapping("/")
			public class CommunityApi {
			public class CommunityApi extends BaseController {
			@Resource
			public ComMngPopulationDAO comMngPopulationDAO;
			@Resource
			public ComEldersAuthUserService comEldersAuthUserService;
			@Resource
			private ComActActivityService comActActivityService;
			@Resource
			@@ -81,18 +138,31 @@
			@Resource
			private EldersAuthService eldersAuthService;
			@Resource
			public ComMngPopulationDAO comMngPopulationDAO;
			@Resource
			public ComEldersAuthUserService comEldersAuthUserService;
			private ComActActSignDAO comActActSignDAO;
			@Resource
			private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
			@Resource
			private ComActEasyPhotoActivityService comActEasyPhotoActivityService;
			@Resource
			private ComActActEvaluateService comActActEvaluateService;
			@Resource
			private ComEldersAuthElderlyService comEldersAuthElderlyService;
			@Resource
			private ComActMicroWishOperationRecordService wishOperationRecordService;
			@Resource
			private ComActActEvaluateDAO comActActEvaluateDAO;
			@Resource
			private ComActActivityInviteService comActActivityInviteService;
			@Resource
			private RabbitTemplate rabbitTemplate;
			@Resource
			private AutomessageSysUserService automessageSysUserService;

			/**
			* 新增社区活动
			*
			* @param comActActivityVO 新增信息
			* @param comActActivityVO
			* 新增信息
			* @return 新增结果
			*/
			@PostMapping("addactivity")
			@@ -101,7 +171,7 @@
			R r = comActActivityService.addActivity(comActActivityVO);
			boolean ok = R.isOk(r);
			if (ok) {
			Long activityId = (Long) r.getData();
			Long activityId = (Long)r.getData();
			Integer hasPrize = comActActivityVO.getHasPrize();
			if (hasPrize.intValue() > 0) {
			List<ComActActPrizeVO> comActActPrizeVOList = comActActivityVO.getComActActPrizeVOList();
			@@ -129,7 +199,8 @@
			/**
			* 编辑社区活动
			*
			* @param comActActivityVO 编辑内容
			* @param comActActivityVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PostMapping("putactivity")
			@@ -142,7 +213,8 @@
			Integer hasPrize = comActActivityVO.getHasPrize();
			Long actActivityVOId = comActActivityVO.getId();
			if (!ObjectUtils.isEmpty(comActActPrizeVOList) && hasPrize.intValue() == 1) {
			comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
			comActActPrizeService.remove(
			new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
			if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
			List<ComActActPrizeDO> comActActPrizeDOS = new ArrayList<>();
			comActActPrizeVOList.forEach(comActActPrizeVO -> {
			@@ -156,9 +228,10 @@
			return R.fail("保存奖品失败");
			}
			}
			}else if(hasPrize.intValue() == 0){
			boolean remove = comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
			log.info("删除社区活动奖品结果【{}】，社区活动id【{}】",remove,actActivityVOId);
			} else if (hasPrize.intValue() == 0) {
			boolean remove = comActActPrizeService.remove(
			new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
			log.info("删除社区活动奖品结果【{}】，社区活动id【{}】", remove, actActivityVOId);
			}
			}
			return r;
			@@ -167,14 +240,16 @@
			/**
			* 删除社区活动
			*
			* @param comActActivityVO 活动主键
			* @param comActActivityVO
			* 活动主键
			* @return 删除结果
			*/
			@PostMapping("deleteactivity")
			public R deleteActivity(@RequestBody ComActActivityVO comActActivityVO) {
			boolean remove = comActActivityService.removeById(comActActivityVO.getId());
			if (remove) {
			comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, comActActivityVO.getId()));
			comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda()
			.eq(ComActActPrizeDO::getActivityId, comActActivityVO.getId()));
			return R.ok();
			}
			return R.fail();
			@@ -183,20 +258,22 @@
			/**
			* 分页查询社区活动
			*
			* @param comActActivityVO 查询参数
			* @param comActActivityVO
			* 查询参数
			* @return 分页集合
			*/
			@PostMapping("pageactivity")
			public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
			R r = comActActivityService.pageActivity(comActActivityVO);
			if (R.isOk(r)) {
			Page<ComActActivityVO> page = (Page<ComActActivityVO>) r.getData();
			Page<ComActActivityVO> page = (Page<ComActActivityVO>)r.getData();
			List<ComActActivityVO> content = page.getRecords();
			if (!ObjectUtils.isEmpty(content)) {
			content.forEach(comActActivityVO1 -> {
			List<ComActActPrizeVO> comActActPrizeVOList = new ArrayList<>();
			Long id = comActActivityVO1.getId();
			List<ComActActPrizeDO> list = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
			List<ComActActPrizeDO> list = comActActPrizeService
			.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
			if (!ObjectUtils.isEmpty(list)) {
			list.forEach(comActActPrizeDO -> {
			ComActActPrizeVO comActActPrizeVO = new ComActActPrizeVO();
			@@ -205,12 +282,15 @@
			});
			}
			comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
			Integer participantMax = comActActivityVO1.getParticipantMax();
			if (participantMax.intValue()==0) {
			comActActivityVO1.setType(1);
			}else{
			comActActivityVO1.setType(2);
			Integer volunteerMax = comActActivityVO1.getVolunteerMax();
			if(comActActivityVO1.getType()==null){
			if (volunteerMax.intValue() != 0) {
			comActActivityVO1.setType(1);
			} else {
			comActActivityVO1.setType(2);
			}
			}
			fillActivitySignList(id, comActActivityVO1);
			});
			page.setRecords(content);
			}
			@@ -221,18 +301,21 @@

			/**
			* 社区后台分页查询社区活动
			* @param comActActivityVO 查询参数
			*
			* @param comActActivityVO
			* 查询参数
			* @return 返回结果
			*/
			@PostMapping("pageactivitycommunityback")
			public R pageActivityCommunityBack(@RequestBody ComActActivityVO comActActivityVO){
			return comActActivityService.pageActivityCommunityBack(comActActivityVO);
			public R pageActivityCommunityBack(@RequestBody ComActActivityVO comActActivityVO) {
			return comActActivityService.pageActivityCommunityBack(comActActivityVO);
			}

			/**
			* 发布活动
			*
			* @param comActActivityVO 主键id 发布时间
			* @param comActActivityVO
			* 主键id 发布时间
			* @return 发布结果
			*/
			@PostMapping("releaseactivity")
			@@ -243,7 +326,8 @@
			/**
			* 取消活动
			*
			* @param comActActivityVO 取消原因
			* @param comActActivityVO
			* 取消原因
			* @return 取消结果
			*/
			@PostMapping("cancelactivity")
			@@ -254,16 +338,22 @@
			/**
			* 活动详情
			*
			* @param id 活动id
			* @param id
			* 活动id
			* @return 详情
			*/
			@PostMapping("detailactivity")
			public R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
			public R detailActivity(@RequestParam("id") Long id,
			@RequestParam(value = "userId", required = false) Long userId,
			@RequestParam(value = "pageNum",defaultValue = "1", required = false) Long pageNum,
			@RequestParam(value = "pageSize",defaultValue = "10", required = false) Long pageSize) {
			ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId);
			if (ObjectUtils.isEmpty(comActActivityVO)) {
			return R.fail("活动不存在");
			}
			List<ComActActPrizeDO> comActActPrizeDOS = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
			//活动奖品
			List<ComActActPrizeDO> comActActPrizeDOS = comActActPrizeService
			.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
			if (!ObjectUtils.isEmpty(comActActPrizeDOS)) {
			List<ComActActPrizeVO> comActActPrizeVOS = new ArrayList<>();
			comActActPrizeDOS.forEach(comActActPrizeDO -> {
			@@ -273,46 +363,143 @@
			});
			comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
			}
			ActivitySignVO activitySignVO = new ActivitySignVO();
			activitySignVO.setActivityId(id);
			R r = comActActivityService.listActivitySigns(activitySignVO);
			if (R.isOk(r)) {
			List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class);
			if (!ObjectUtils.isEmpty(activitySignVOS)) {
			for (ActivitySignVO signVO:activitySignVOS) {
			if(StringUtils.isEmpty(signVO.getName())){
			signVO.setName(signVO.getNickName());
			}
			}
			List<ActivitySignVO> collect = activitySignVOS.stream().filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 1).collect(Collectors.toList());
			if (!ObjectUtils.isEmpty(collect)) {
			int size = collect.size();
			if (size>=6) {
			comActActivityVO.setActivityVolunteerList(collect.subList(0,6));
			} else {
			comActActivityVO.setActivityVolunteerList(collect);
			}
			}
			List<ActivitySignVO> collect1 = activitySignVOS.stream().filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 0).collect(Collectors.toList());
			if (!ObjectUtils.isEmpty(collect1)) {
			int size = collect1.size();
			if (size>=6) {
			comActActivityVO.setActivitySignVOList(collect1.subList(0,6));
			} else {
			comActActivityVO.setActivitySignVOList(collect1);
			}
			}
			//
			//活动评价
			IPage<ComActActEvaluateVO> comActActEvaluatePage = comActActEvaluateDAO.getEvaluateListPage(new Page(pageNum,pageSize),id);
			comActActivityVO.setComActActEvaluateVOList(comActActEvaluatePage.getRecords());
			//活动评价总数
			comActActivityVO.setEvaluateAmount(comActActEvaluatePage.getTotal());
			List<ComActActEvaluateDO> comActActEvaluateList = comActActEvaluateDAO
			.selectList(new QueryWrapper<ComActActEvaluateDO>().lambda().eq(ComActActEvaluateDO::getActivityId, id));
			if (comActActEvaluateList != null && comActActEvaluateList.size() > 0) {
			BigDecimal starNum = BigDecimal.ZERO;
			//总星级
			for (ComActActEvaluateDO evaluate:comActActEvaluateList) {
			starNum = starNum.add(BigDecimal.valueOf(evaluate.getStarLevel()==null?0:evaluate.getStarLevel()));
			}

			//评分星级(如果无评分默认5分)=总星级/总评价人数
			if(starNum.compareTo(BigDecimal.ZERO) == 0){
			comActActivityVO.setEvaluateLevel(BigDecimal.valueOf(5));
			}else{
			comActActivityVO.setEvaluateLevel(starNum.divide(BigDecimal.valueOf(comActActEvaluateList.size()),2, RoundingMode.HALF_UP));
			}
			}else{
			comActActivityVO.setEvaluateLevel(BigDecimal.valueOf(5));
			}
			//当前用户对活动的评分
			ComActActEvaluateVO userActEvaluateVO = comActActEvaluateDAO.getEvaluateListByUserId(id,userId);
			if(userActEvaluateVO != null){
			comActActivityVO.setMyRating(userActEvaluateVO.getStarLevel());
			}
			fillActivitySignList(id, comActActivityVO);
			comActActivityVO.setIntegral(0);
			return R.ok(comActActivityVO);
			}

			/**
			* 填充活动报名名单
			* @param activityId 活动id
			* @param comActActivityVO 需填充VO
			*/
			private void fillActivitySignList(Long activityId, ComActActivityVO comActActivityVO) {
			//活动报名名单
			ActivitySignVO activitySignVO = new ActivitySignVO();
			activitySignVO.setActivityId(activityId);
			activitySignVO.setStatus(1);
			R r = comActActivityService.listActivitySigns(activitySignVO);
			if (R.isOk(r)) {
			List<ActivitySignVO> activitySignVOS =
			JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ActivitySignVO.class);
			if (!ObjectUtils.isEmpty(activitySignVOS)) {
			for (ActivitySignVO signVO : activitySignVOS) {
			if (StringUtils.isEmpty(signVO.getName())) {
			signVO.setName(signVO.getNickName());
			}
			}
			List<ActivitySignVO> collect = activitySignVOS.stream()
			.filter(activitySignVO1 -> activitySignVO1.getSignIdentity() == 3).collect(toList());
			if (!ObjectUtils.isEmpty(collect)) {
			int size = collect.size();
			if (size >= 6) {
			comActActivityVO.setActivityVolunteerList(collect.subList(0, 6));
			} else {
			comActActivityVO.setActivityVolunteerList(collect);
			}
			}
			List<ActivitySignVO> collect1 = activitySignVOS.stream()
			.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);
			}
			}
			}

			}
			}

			/**
			* 活动签到
			*
			* @param comActActRegistVO 请求参数
			* @return 签到结果
			*/
			@PostMapping("activity/sign-in")
			public R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) {
			return comActActivityService.activitySignIn(comActActRegistVO);
			}

			/**
			* 用户签到列表
			*
			* @param userId 用户id
			* @return 用户签到记录列表
			*/
			@GetMapping("/sign-in/user/list")
			public R listSignInActivity(@RequestParam("userId") Long userId) {
			return comActActivityService.listSignInActivity(userId);
			}

			/**
			* 社区活动评价
			*
			* @param comActActEvaluateVO 社区评价VO
			* @return 评价结果
			*/
			@PostMapping("activity/evaluate")
			public R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
			return comActActEvaluateService.activityEvaluate(comActActEvaluateVO);
			}

			/**
			* 用户评价列表
			*
			* @param userId 用户id
			* @return 当前用户对所有活动的评价列表
			*/
			@GetMapping("/evaluate/user/list")
			public R listEvaluate(@RequestParam("userId") Long userId) {
			return comActActEvaluateService.listEvaluate(userId);
			}

			/**
			* 分页活动报名名单
			*
			* @param activitySignVO 查询参数
			* @param activitySignVO
			* 查询参数
			* @return 报名人员集合
			*/
			@PostMapping("listactivitysign")
			@@ -323,7 +510,8 @@
			/**
			* 活动报名名单
			*
			* @param activitySignVO 查询参数
			* @param activitySignVO
			* 查询参数
			* @return 报名人员集合
			*/
			@PostMapping("listactivitysigns")
			@@ -332,9 +520,118 @@
			}

			/**
			* description getSignLists 查询活动报名名单
			* @param activitySignVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("activity/sign/getList")
			public R getSignLists(@RequestBody ActivitySignVO activitySignVO){
			return comActActivityService.getSignLists(activitySignVO);
			}

			/**
			* description listActivityRegists 分页查询活动评价
			* @param comActActEvaluateVO 活动评价vo
			* @return R 分页查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("activity/evaluate/page")
			public R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO) {
			return comActActivityService.pageActivityEvaluates(comActActEvaluateVO);
			}

			/**
			* description getEvaluateLists 查询活动评价
			* @param comActActEvaluateVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("activity/evaluate/getList")
			public R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO){
			return comActActivityService.getEvaluateLists(comActActEvaluateVO);
			}

			/**
			* description pageActivityRegists 分页查询活动签到
			* @param comActActRegistVO 活动签到vo
			* @return R 分页查询结果
			* @author txb
			* @date 2021/8/24 14:03
			*/
			@PostMapping("activity/regist/page")
			public R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO) {
			return comActActivityService.pageActivityRegists(comActActRegistVO);
			}

			/**
			* description getRegistLists 查询活动签到
			* @param comActActRegistVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/25 9:33
			*/
			@PostMapping("activity/regist/getList")
			public R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO){
			return comActActivityService.getRegistLists(comActActRegistVO);
			}

			/**
			* description getRegistLists 查询活动未签到
			* @param comActActRegistVO 查询参数
			* @return R 查询结果
			* @author txb
			* @date 2021/8/25 9:33
			*/
			@PostMapping("activity/noRegist/getList")
			public R getNoRegistLists(@RequestBody ComActActRegistVO comActActRegistVO){
			return comActActivityService.getNoRegistLists(comActActRegistVO);
			}

			/**
			* description activityStagistics 活动数据统计
			* @param activityId 活动id
			* @return R 统计结果
			* @author txb
			* @date 2021/8/25 13:33
			*/
			@GetMapping("activity/statistics")
			public R activityStatistics(@RequestParam("activityId") Long activityId){
			return comActActivityService.activityStatistics(activityId);
			}

			/**
			* 获取活动历史封面 getPictureList
			* @param userId 用户id
			* @return R 统计结果
			* @author txb
			* @date 2021/8/27 13:33
			*/
			@GetMapping("/activity/picture/getList")
			public R getPictureList(@RequestParam("userId") Long userId){
			return comActActivityService.getPictureList(userId);
			}

			/**
			* 获取系统预置图库 getSysPictureList
			* @param type 图库类型
			* @return R 系统图库集
			* @author txb
			* @date 2021/8/27 13:33
			*/
			@GetMapping("/activity/sysPicture/getList")
			public R getSysPictureList(@RequestParam(value = "type") Integer type){
			return comActActivityService.getSysPictureList(type);
			}

			/**
			* 新增社区动态
			*
			* @param comActDynVO 新增信息
			* @param comActDynVO
			* 新增信息
			* @return 新增结果
			*/
			@PostMapping("adddynamic")
			@@ -343,15 +640,21 @@
			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()));
			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(Collectors.toList());
			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);
			@@ -369,32 +672,42 @@
			/**
			* 编辑社区动态
			*
			* @param comActDynVO 编辑内容
			* @param comActDynVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PostMapping("putdynamic")
			public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
			ComActDynDO comActDynDO = new ComActDynDO();
			Long id = comActDynVO.getId();
			BeanUtils.copyProperties(comActDynVO, comActDynDO);
			ComActDynDO comActDynDO = comActDynService.getById(comActDynVO.getId());
			if (comActDynDO == null) {
			return R.fail("未查到社区动态记录");
			}
			// Long id = comActDynVO.getId();
			Integer isTopping = comActDynVO.getIsTopping();
			boolean b = isTopping.intValue() == 1;
			if(b){
			ComActDynDO comActDynDO1 = comActDynService.getById(id);
			Integer status = comActDynDO1.getStatus();
			if (status.intValue()==0) {
			return R.fail("该动态还未发布");
			boolean b = isTopping.equals(1);
			if (b) {
			Integer status = comActDynDO.getStatus();
			if (status.equals(0)) {
			return R.fail("待发布的社区动态不可置顶");
			}
			}

			// if(StringUtils.isEmpty(comActDynVO.getCover())){
			// comActDynVO.setCover(comActDynDO.getCover());
			// }
			BeanUtils.copyProperties(comActDynVO, comActDynDO);

			boolean update = comActDynService.updateById(comActDynDO);
			if (update) {
			// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
			// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
			if (b) {
			List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId, comActDynVO.getCommunityId()));
			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::getUpdateAt)).collect(Collectors.toList());
			List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getUpdateAt))
			.collect(toList());
			ComActDynDO comActDynDO1 = collect.get(0);
			comActDynDO1.setIsTopping(0);
			boolean updateById = comActDynService.updateById(comActDynDO1);
			@@ -412,7 +725,8 @@
			/**
			* 删除社区动态
			*
			* @param comActDynVO 动态id
			* @param comActDynVO
			* 动态id
			* @return 删除结果
			*/
			@PostMapping("deletedynamic")
			@@ -427,7 +741,8 @@
			/**
			* 分页查询社区动态
			*
			* @param comActDynVO 查询参数
			* @param comActDynVO
			* 查询参数
			* @return 动态集合
			*/
			@PostMapping("pagedynamic")
			@@ -438,7 +753,8 @@
			/**
			* 管理后台分页查询社区动态
			*
			* @param comActDynVO 查询参数
			* @param comActDynVO
			* 查询参数
			* @return 动态集合
			*/
			@PostMapping("pagedynamicByAdmin")
			@@ -449,7 +765,8 @@
			/**
			* 社区动态详情
			*
			* @param id 动态id
			* @param id
			* 动态id
			* @return 详情
			*/
			@PostMapping("detaildynamic")
			@@ -457,11 +774,11 @@
			return comActDynService.detailDynamic(id);
			}


			/**
			* 分页查询随手拍
			*
			* @param comActEasyPhotoVO 查询参数
			* @param comActEasyPhotoVO
			* 查询参数
			* @return 心愿列表
			*/
			@PostMapping("pageeasyphoto")
			@@ -470,10 +787,32 @@
			}

			/**
			* 城管安排
			*
			* @param comActEasyPhotoVO
			* 查询参数
			* @return 心愿列表
			*/
			@PostMapping("updatePageeasyphoto")
			public R updatePageeasyphoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
			return comActEasyPhotoService.updatePageeasyphoto(comActEasyPhotoVO);
			}

			/**
			* 城管导出
			*/
			@PostMapping("exportEasyPhoto")
			public R exportEasyPhoto(@RequestBody ExportEasyPhotoDTO exportEasyPhotoDTO) {
			return comActEasyPhotoService.export(exportEasyPhotoDTO);
			}

			/**
			* 随手拍详情
			*
			* @param id 随手拍主键
			* @param userId 登录用户
			* @param id
			* 随手拍主键
			* @param userId
			* 登录用户
			* @return 详情内容
			*/
			@PostMapping("detaileasyphoto")
			@@ -484,27 +823,31 @@
			/**
			* 随手拍删除
			*
			* @param id 随手拍主键
			* @param userId 登录用户
			* @param id
			* 随手拍主键
			* @param userId
			* 登录用户
			* @return 详情内容
			*/
			@PostMapping("deleteEasyPhoto")
			public R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
			ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoService.getBaseMapper().selectById(id);
			if(comActEasyPhotoDO==null){
			if (comActEasyPhotoDO == null) {
			return R.fail("随手拍不存在");
			}
			comActEasyPhotoDO.setDelTag(1);
			int updateById = comActEasyPhotoService.getBaseMapper().updateById(comActEasyPhotoDO);
			if(updateById==1){
			if (updateById == 1) {
			return R.ok();
			}
			return R.fail();
			}

			/**
			* 分页查询微心愿
			*
			* @param comActMicroWishVO 查询参数
			* @param comActMicroWishVO
			* 查询参数
			* @return 分页集合
			*/
			@PostMapping("pagemicrowish")
			@@ -512,11 +855,18 @@
			return comActMicroWishService.pageMicroWish(comActMicroWishVO);
			}

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

			/**
			* 心愿详情
			*
			* @param id 查询主键
			* @param userId 登录用户id
			* @param id
			* 查询主键
			* @param userId
			* 登录用户id
			* @return 心愿内容
			*/
			@PostMapping("detailmicrowish")
			@@ -527,7 +877,8 @@
			/**
			* 审核、分配、反馈心愿
			*
			* @param comActMicroWishVO 具体操作
			* @param comActMicroWishVO
			* 具体操作
			* @return 操作结果
			*/
			@PostMapping("putlmicrowish")
			@@ -538,7 +889,8 @@
			/**
			* 分页展示我的所有活动时间倒序排列
			*
			* @param comActActivityVO 分页参数
			* @param comActActivityVO
			* 分页参数
			* @return 分页集合
			*/
			@PostMapping("pagemyactivity")
			@@ -549,7 +901,8 @@
			/**
			* 报名/取消报名社区活动
			*
			* @param signactivityVO 报名参数
			* @param signactivityVO
			* 报名参数
			* @return 报名取消报名结果
			*/
			@PostMapping("signactivity")
			@@ -560,7 +913,8 @@
			/**
			* 上传随手拍
			*
			* @param comActEasyPhotoVO 上传数据
			* @param comActEasyPhotoVO
			* 上传数据
			* @return 上传结果
			*/
			@PostMapping("addeasyphoto")
			@@ -570,7 +924,8 @@

			/**
			* 查询随手拍是否有活动
			* @return 活动详情
			*
			* @return 活动详情
			*/
			@PostMapping("getEasyPhotoActivity")
			public R getEasyPhotoActivity(@RequestParam("communityId") Long communityId) {
			@@ -580,7 +935,8 @@
			/**
			* 发布微心愿
			*
			* @param comActMicroWishVO 发布内容
			* @param comActMicroWishVO
			* 发布内容
			* @return 发布结果
			*/
			@PostMapping("addmicrowish")
			@@ -589,6 +945,8 @@
			BeanUtils.copyProperties(comActMicroWishVO, comActMicroWishDO);
			boolean save = comActMicroWishService.save(comActMicroWishDO);
			if (save) {
			wishOperationRecordService.addOperationRecord("用户提交微心愿",comActMicroWishVO.getSponsorId()
			,comActMicroWishDO.getId(), ComActMicroWishOperationRecordDO.type.ytj,"用户提交微心愿",null);
			return R.ok();
			}
			return R.fail();
			@@ -597,7 +955,8 @@
			/**
			* 点赞/取消点赞随手拍
			*
			* @param comActEasyPhotoVO 操作参数
			* @param comActEasyPhotoVO
			* 操作参数
			* @return 操作结果
			*/
			@PostMapping("puteasyphoto")
			@@ -608,7 +967,8 @@
			/**
			* 点赞/取消点赞微心愿
			*
			* @param comActMicroWishVO 操作参数
			* @param comActMicroWishVO
			* 操作参数
			* @return 操作结果
			*/
			@PostMapping("putmicrowish")
			@@ -619,8 +979,10 @@
			/**
			* 新增社区动态浏览记录
			*
			* @param id 动态主键
			* @param userId 登录用户id
			* @param id
			* 动态主键
			* @param userId
			* 登录用户id
			* @return 新增结果
			*/
			@PostMapping("adddynamicuser")
			@@ -631,7 +993,8 @@
			/**
			* 审核反馈随手拍
			*
			* @param comActEasyPhotoVO 操作参数
			* @param comActEasyPhotoVO
			* 操作参数
			* @return 操作结果
			*/
			@PostMapping("puteasyphotostatus")
			@@ -640,9 +1003,18 @@
			}

			/**
			* 城管随手拍统计
			*/
			@PostMapping("/esayPhotoCount")
			public R esayphotoCount(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
			return comActEasyPhotoService.easyPhotoCount(comActEasyPhotoVO);
			}

			/**
			* 新增社区
			*
			* @param comActVO 社区信息
			* @param comActVO
			* 社区信息
			* @return 新增结果
			*/
			@PostMapping("addcommunity")
			@@ -653,7 +1025,8 @@
			/**
			* 编辑社区
			*
			* @param comActVO 编辑内容
			* @param comActVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PostMapping("putCommunity")
			@@ -664,7 +1037,8 @@
			/**
			* 房屋信息
			*
			* @param userId 用户id
			* @param userId
			* 用户id
			* @return 房屋信息
			*/
			@PostMapping("detailhouse")
			@@ -675,14 +1049,15 @@
			/**
			* 新增小区
			*
			* @param comMngStructAreaVO 小区信息
			* @param comMngStructAreaVO
			* 小区信息
			* @return 新增结果
			*/
			@PostMapping("addarea")
			R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
			R r = comMngStructAreaService.addArea(comMngStructAreaVO);
			if (R.isOk(r)) {
			String areaCode = String.valueOf(r.getData()) ;
			String areaCode = String.valueOf(r.getData());
			comMngStructAreaVO.setAreaCode(areaCode);
			R r1 = comMngStructHouseService.addHouseArea(comMngStructAreaVO);
			return r1;
			@@ -693,7 +1068,8 @@
			/**
			* 分页查询小区
			*
			* @param comMngStructAreaVO 查询参数
			* @param comMngStructAreaVO
			* 查询参数
			* @return 分页结果
			*/
			@PostMapping("pagearea")
			@@ -704,7 +1080,8 @@
			/**
			* 编辑小区
			*
			* @param comMngStructAreaVO 编辑内容
			* @param comMngStructAreaVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PostMapping("putarea")
			@@ -712,17 +1089,17 @@
			return comMngStructAreaService.putArea(comMngStructAreaVO);
			}


			/**
			* 删除小区
			*
			* @param comMngStructAreaVO 地址编码
			* @param comMngStructAreaVO
			* 地址编码
			* @return 删除结果
			*/
			@PostMapping("deletearea")
			@Transactional(rollbackFor = Exception.class)
			public R deleteArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) {
			// 先删除小区小面所有房屋、删除用户和小区房屋的绑定关系
			// 先删除小区小面所有房屋、删除用户和小区房屋的绑定关系
			R r = comMngStructHouseService.batchDeleteHouse(comMngStructAreaVO);
			if (R.isOk(r)) {
			R r1 = comMngStructAreaService.deleteArea(comMngStructAreaVO);
			@@ -736,7 +1113,8 @@
			/**
			* 小区批量建房
			*
			* @param batchhouseVO 建房参数
			* @param batchhouseVO
			* 建房参数
			* @return 建房结果
			*/
			@PostMapping("batchhouse")
			@@ -747,7 +1125,7 @@
			String ruleDoor = batchhouseVO.getRuleDoor();
			String ruleConnector = batchhouseVO.getRuleConnector();
			String ruleFloor = batchhouseVO.getRuleFloor();
			ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO();
			ComMngStructAreaVO comMngStructAreaVO = new ComMngStructAreaVO();
			comMngStructAreaVO.setRoleDoor(ruleDoor);
			comMngStructAreaVO.setRoleFloor(ruleFloor);
			comMngStructAreaVO.setRoleConnector(ruleConnector);
			@@ -762,7 +1140,8 @@
			/**
			* 展示下级建筑
			*
			* @param houseCode 房屋编号
			* @param houseCode
			* 房屋编号
			* @return 下级建筑列表
			*/
			@PostMapping("listsubordinatebuilding")
			@@ -773,26 +1152,26 @@
			/**
			* 添加同级地址
			*
			* @param batchhouseVO 添加地址
			* @param batchhouseVO
			* 添加地址
			* @return 添加结果
			*/
			@PostMapping("addhouse")
			public R addHouse(@RequestBody BatchhouseVO batchhouseVO) {
			R r=comMngStructAreaService.selectAreaByAreaCode(batchhouseVO.getAreaCode());
			R r = comMngStructAreaService.selectAreaByAreaCode(batchhouseVO.getAreaCode());
			if (R.isOk(r)) {
			ComMngStructAreaDO comMngStructAreaDO = (ComMngStructAreaDO)r.getData();
			try {
			R r1 = comMngStructHouseService.addHouse(batchhouseVO, comMngStructAreaDO);
			R r1 = comMngStructHouseService.addHouse(batchhouseVO, comMngStructAreaDO);
			return r1;
			} catch (Exception e) {
			if (e.getMessage().contains("unique_house_name")) {
			return R.fail("房屋地址重复");
			}else {
			log.error("添加同级地址失败【{}】",e.getMessage());
			} else {
			log.error("添加同级地址失败【{}】", e.getMessage());
			return R.fail("添加房屋失败");
			}
			}


			}
			return r;
			@@ -801,7 +1180,8 @@
			/**
			* 编辑地址
			*
			* @param comMngStructHouseVO 编辑内容
			* @param comMngStructHouseVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PutMapping("puthouse")
			@@ -812,7 +1192,8 @@
			/**
			* 删除地址
			*
			* @param comMngStructHouseVO 删除指定地址和所有下级
			* @param comMngStructHouseVO
			* 删除指定地址和所有下级
			* @return 删除结果
			*/
			@PostMapping("deletehouse")
			@@ -823,7 +1204,8 @@
			/**
			* 新增其他建筑
			*
			* @param comMngStructOtherBuildVO 建筑参数
			* @param comMngStructOtherBuildVO
			* 建筑参数
			* @return 新增结果
			*/
			@PostMapping("addotherbuild")
			@@ -833,146 +1215,182 @@

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

			/**
			* 分页查询其他建筑
			* @param comMngStructOtherBuildVO 分页查询参数
			*
			* @param comMngStructOtherBuildVO
			* 分页查询参数
			* @return 查询结果
			*/
			@PostMapping("pageotherbuild")
			public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
			public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
			return comMngStructOtherBuildService.pageOtherBuild(comMngStructOtherBuildVO);
			}

			/**
			* 增加志愿者
			* @param comMngVolunteerMngVO 志愿者信息
			*
			* @param comMngVolunteerMngVO
			* 志愿者信息
			* @return 增加结果
			*/
			@PostMapping("addvolunteer")
			R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			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
			*/
			@GetMapping("getVolunteerById")
			R getVolunteerById(@RequestParam("id")Long id){
			R getVolunteerById(@RequestParam("id") Long id) {
			return comMngVolunteerMngService.getVolunteerById(id);
			}

			/**
			* 删除志愿者
			* @param comMngVolunteerMngVO 手机号
			*
			* @param comMngVolunteerMngVO
			* 手机号
			* @return 删除结果
			*/
			@PostMapping("deletevolunteer")
			public R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			public R deleteVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
			return comMngVolunteerMngService.deleteVolunteer(comMngVolunteerMngVO);
			}

			/**
			* 编辑志愿者
			* @param comMngVolunteerMngVO 编辑内容
			*
			* @param comMngVolunteerMngVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PostMapping("putvolunteer")
			R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			R putVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
			return comMngVolunteerMngService.putVolunteer(comMngVolunteerMngVO);
			}

			/**
			* 分页展示志愿者
			* @param comMngVolunteerMngVO 查询参数
			*
			* @param comMngVolunteerMngVO
			* 查询参数
			* @return 分页集合返回
			*/
			@PostMapping("pagevolunteer")
			public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
			return comMngVolunteerMngService.pageVolunteer(comMngVolunteerMngVO);
			}

			/**
			* 分页展示志愿者审核
			* @param comMngVolunteerMngVO 查询参数
			*
			* @param comMngVolunteerMngVO
			* 查询参数
			* @return 查询结果
			*/
			@PostMapping("pagevolunteerexamine")
			public R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			public R pageVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
			return comMngVolunteerMngService.pageVolunteerExamine(comMngVolunteerMngVO);
			}

			/**
			* 志愿者审核详情
			* @param id 主键
			*
			* @param id
			* 主键
			* @return 详情
			*/
			@PostMapping("detailvolunteerexamine")
			public R detailVolunteerExamine(@RequestParam("id") Long id){
			public R detailVolunteerExamine(@RequestParam("id") Long id) {
			return comMngVolunteerMngService.detailVolunteerExamine(id);
			}

			/**
			* 志愿者审核
			* @param comMngVolunteerMngVO 审核操作
			*
			* @param comMngVolunteerMngVO
			* 审核操作
			* @return 审核结果
			*/
			@PostMapping("putvolunteerexamine")
			public R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			public R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
			return comMngVolunteerMngService.putVolunteerExamine(comMngVolunteerMngVO);
			}

			/**
			* 删除志愿者审核
			* @param comMngVolunteerMngVO 主键
			*
			* @param comMngVolunteerMngVO
			* 主键
			* @return 删除结果
			*/
			@PostMapping("deletevolunteerexamine")
			public R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
			public R deleteVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
			return comMngVolunteerMngService.deleteVolunteerExamine(comMngVolunteerMngVO);
			}

			/**
			* 查询区域
			* @param comActVO 登录人的经纬度、或者指定区域的社区
			*
			* @param comActVO
			* 登录人的经纬度、或者指定区域的社区
			* @return 社区集合
			*/
			@PostMapping("listcommunity")
			public R listCommunity(@RequestBody ComActVO comActVO){
			public R listCommunity(@RequestBody ComActVO comActVO) {
			return comActService.listCommunity(comActVO);
			}

			/**
			* 用户修改手机号对应的志愿者手机号也要修改
			* @param userPhoneVO 新旧手机号
			*
			* @param userPhoneVO
			* 新旧手机号
			* @return 修改结果
			*/
			@PostMapping("putvolunteerphone")
			public R putVolunteerPhone(@RequestBody UserPhoneVO userPhoneVO){
			public R putVolunteerPhone(@RequestBody UserPhoneVO userPhoneVO) {
			return comMngVolunteerMngService.putVolunteerPhone(userPhoneVO);
			}

			/**
			* 房屋地址下拉列表
			* @param parentCode 父级编码
			* @param areaId 小区id
			*
			* @param parentCode
			* 父级编码
			* @param areaId
			* 小区id
			* @return 下级列表
			*/
			@PostMapping("listhouses")
			public R listHouses(@RequestParam("parentCode")String parentCode, @RequestParam("areaId")Long areaId){
			public R listHouses(@RequestParam("parentCode") String parentCode, @RequestParam("areaId") Long areaId) {
			if (ObjectUtils.isEmpty(parentCode)) {
			R r = comMngStructAreaService.selectAreaById(areaId);
			if (R.isOk(r)) {
			parentCode =String.valueOf(r.getData()) ;
			}else{
			parentCode = String.valueOf(r.getData());
			} else {
			return R.fail("用户没有绑定小区");
			}
			}
			@@ -981,11 +1399,13 @@

			/**
			* 新增房屋
			* @param comMngStructHouseVO 房屋信息
			*
			* @param comMngStructHouseVO
			* 房屋信息
			* @return 新增结果
			*/
			@PostMapping("addhouses")
			public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO){
			public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO) {
			R r = comMngStructAreaService.selectAreaById(comMngStructHouseVO.getAreaId());
			if (!R.isOk(r)) {
			return R.fail("用户没有绑定小区");
			@@ -997,53 +1417,64 @@

			/**
			* 查询小区
			* @param communityId 社区id
			*
			* @param communityId
			* 社区id
			* @return 小区集合
			*/
			@PostMapping("listarea")
			public R listArea(@RequestParam("communityId")Long communityId){
			public R listArea(@RequestParam("communityId") Long communityId) {
			return comMngStructAreaService.listArea(communityId);
			}

			/**
			* 用户参加的所有社区活动
			* @param userId 用户id
			*
			* @param userId
			* 用户id
			* @return 活动列表
			*/
			@PostMapping("listactivity")
			public R listActivity(@RequestParam("userId")Long userId ){
			return comActActivityService.listActivity(userId);
			public R listActivity(@RequestParam("userId") Long userId,
			@RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
			return comActActivityService.listActivity(userId, status,type);
			}

			/**
			* 用户确认心愿
			* @param comActMicroWishVO 用户评价
			*
			* @param comActMicroWishVO
			* 用户评价
			* @return 确认结果
			*/
			@PostMapping("putmicrowishconfirm")
			R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO){
			R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO) {
			return comActMicroWishService.putMicroWishConfirm(comActMicroWishVO);
			}

			/**
			* 建筑类型
			* @param communityId 社区id
			*
			* @param communityId
			* 社区id
			* @return 建筑集合
			*/
			@PostMapping("listcommngstructbuildtype")
			public R listComMngStructBuildType(@RequestParam("communityId") Long communityId){
			public R listComMngStructBuildType(@RequestParam("communityId") Long communityId) {
			return comMngStructOtherBuildService.listComMngStructBuildType(communityId);
			}

			/**
			* 增加删除建筑类型
			* @param systemmanagementConfigVO 操作内容
			* @return 操作结果
			*
			* @param systemmanagementConfigVO
			* 操作内容
			* @return 操作结果
			*/
			@PostMapping("putcommngstructbuildtype")
			public R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
			public R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO) {
			try {
			R r=comMngStructOtherBuildService.putComMngStructBuildType(systemmanagementConfigVO);
			R r = comMngStructOtherBuildService.putComMngStructBuildType(systemmanagementConfigVO);
			} catch (ServiceException e) {
			return R.fail(e.getMessage());
			}
			@@ -1052,46 +1483,54 @@

			/**
			* 社区详情
			* @param communityId 社区id
			*
			* @param communityId
			* 社区id
			* @return 社区详情
			*/
			@PostMapping("detailcommunity")
			public R detailCommunity(@RequestParam("communityId") Long communityId){
			public R detailCommunity(@RequestParam("communityId") Long communityId) {
			return comActService.detailCommunity(communityId);
			}

			/**
			* 小区详情
			* @param areaId 小区id
			*
			* @param areaId
			* 小区id
			* @return 小区信息
			*/
			@PostMapping("detailarea")
			public R detailArea(@RequestParam("areaId")Long areaId){
			public R detailArea(@RequestParam("areaId") Long areaId) {
			return comMngStructAreaService.detailArea(areaId);
			}

			/**
			* 分页查询社区
			* @param pageComActDTO 查询参数
			*
			* @param pageComActDTO
			* 查询参数
			* @return 分页集合
			*/
			@PostMapping("pagecommunity")
			public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){
			public R pageCommunity(@RequestBody PageComActDTO pageComActDTO) {
			return comActService.pageCommunity(pageComActDTO);
			}

			/**
			* 志愿者详情
			* @param id 主键
			*
			* @param id
			* 主键
			* @return 志愿者
			*/
			@PostMapping("detailvolunteer")
			public R detailVolunteer(@RequestParam("id") Long id){
			public R detailVolunteer(@RequestParam("id") Long id) {
			R r = comMngVolunteerMngService.detailVolunteer(id);
			if (R.isOk(r)) {
			ComMngVolunteerMngAppletsVO comMngVolunteerMngAppletsVO =(ComMngVolunteerMngAppletsVO) r.getData();
			ComMngVolunteerMngAppletsVO comMngVolunteerMngAppletsVO = (ComMngVolunteerMngAppletsVO)r.getData();
			String phone = comMngVolunteerMngAppletsVO.getPhone();
			List<ComActActivityVO> comActActivityVOS= comActActivityService.listActivityByPhone(phone);
			List<ComActActivityVO> comActActivityVOS = comActActivityService.listActivityByPhone(phone);
			comMngVolunteerMngAppletsVO.setComActActivityVOList(comActActivityVOS);
			r.setData(comMngVolunteerMngAppletsVO);
			}
			@@ -1100,33 +1539,38 @@

			/**
			* 查询平台所有的社区
			*
			* @return 社区集合按照创建顺序倒序排列
			*/
			@PostMapping("listcommunityall")
			public R listCommunityAll(){
			return comActService.listCommunityAll();
			public R listCommunityAll(@RequestParam("areaCode") String areaCode) {
			return comActService.listCommunityAll(areaCode);
			}

			/**
			* 社区管理后台数据看板代办事件
			* @param communityId 社区id
			* @param userId 登录用户信息
			*
			* @param communityId
			* 社区id
			* @param userId
			* 登录用户信息
			* @return 代办事件列表
			*/
			@PostMapping("indexdatacommunitybackstage")
			public R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId")Long userId){
			List<TodoEventsVO> todoEventsVOS=new ArrayList<>();
			List<TodoEventsVO> todoEventsVOS1=comActEasyPhotoService.selectNeedToDo(communityId,userId);
			List<TodoEventsVO> todoEventsVOS2=comActMicroWishService.selectNeedToDo(communityId,userId);
			List<TodoEventsVO> todoEventsVOS3=comMngVolunteerMngService.selectNeedToDo(communityId,userId);
			public R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId,
			@RequestParam("userId") Long userId) {
			List<TodoEventsVO> todoEventsVOS = new ArrayList<>();
			List<TodoEventsVO> todoEventsVOS1 = comActEasyPhotoService.selectNeedToDo(communityId, userId);
			List<TodoEventsVO> todoEventsVOS2 = comActMicroWishService.selectNeedToDo(communityId, userId);
			List<TodoEventsVO> todoEventsVOS3 = comMngVolunteerMngService.selectNeedToDo(communityId, userId);

			TodoEventsVO todoEventsVO=new TodoEventsVO();
			TodoEventsVO todoEventsVO = new TodoEventsVO();
			todoEventsVO.setType(1);
			todoEventsVO.setNum(todoEventsVOS1.size());
			TodoEventsVO todoEventsVO1=new TodoEventsVO();
			TodoEventsVO todoEventsVO1 = new TodoEventsVO();
			todoEventsVO1.setType(2);
			todoEventsVO1.setNum(todoEventsVOS2.size());
			TodoEventsVO todoEventsVO2=new TodoEventsVO();
			TodoEventsVO todoEventsVO2 = new TodoEventsVO();
			todoEventsVO2.setType(4);
			todoEventsVO2.setNum(todoEventsVOS3.size());
			todoEventsVOS.add(todoEventsVO);
			@@ -1137,220 +1581,266 @@

			/**
			* 删除社区
			* @param communityId 社区id
			*
			* @param communityId
			* 社区id
			* @return 删除结果
			*/
			@PostMapping("delectcommunity")
			public R delectCommunity(@RequestParam("communityId") Long communityId){
			public R delectCommunity(@RequestParam("communityId") Long communityId) {
			return comActService.delectCommunity(communityId);
			}

			/**
			* 定时任务刷新社区动态置顶状态
			*
			* @return 刷新结果
			*/
			@PostMapping("timedtaskdynistopping")
			public R timedTaskDynIstopping(){
			public R timedTaskDynIstopping() {
			return comActDynService.timedTaskDynIstopping();
			}

			/**
			* 定时任务刷新社区动态发布状态
			*
			* @return
			*/
			@PostMapping("timedtaskdynstatus")
			public R timedTaskDynStatus(){
			public R timedTaskDynStatus() {
			return comActDynService.timedTaskDynStatus();
			}

			/**
			* 定时任务查询所有要取消的社区活动
			* @return 社区活动集合
			*
			* @return 社区活动集合
			*/
			@PostMapping("timedtaskactactivity")
			public R timedTaskActActivity(){
			public R timedTaskActActivity() {
			return comActActivityService.timedTaskActActivity();
			}

			/**
			* 定时任务刷新社区活动的各个状态除取消外
			*
			* @return 更新结果
			*/
			@PostMapping("timedtaskactactivityall")
			R timedTaskActActivityAll(){
			R timedTaskActActivityAll() {
			return comActActivityService.timedTaskActActivityAll();
			}

			/**
			* 定时任务刷新微心愿的状态
			*
			* @return 更新结果
			*/
			@PostMapping("timedtaskactmicrowish")
			R timedTaskActMicroWishAll(){
			R timedTaskActMicroWishAll() {
			return comActMicroWishService.timedTaskActMicroWishAll();
			}

			/**
			* 其他建筑详情
			* @param id 主键id
			*
			* @param id
			* 主键id
			* @return 建筑内容
			*/
			@PostMapping("detailotherbuild")
			public R detailOtherbuild(@RequestParam("id")Long id){
			public R detailOtherbuild(@RequestParam("id") Long id) {
			return comMngStructOtherBuildService.detailOtherbuild(id);
			}

			/**
			* 编辑其他建筑
			* @param comMngStructOtherBuildVO 编辑内容
			*
			* @param comMngStructOtherBuildVO
			* 编辑内容
			* @return 编辑结果
			*/
			@PostMapping("putotherbuild")
			public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
			public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
			return comMngStructOtherBuildService.putOtherbuild(comMngStructOtherBuildVO);
			}

			/**
			* 删除其他建筑
			* @param id 主键
			*
			* @param id
			* 主键
			* @return 删除结果
			*/
			@PostMapping("deleteotherbuild")
			public R deleteOtherbuild(@RequestParam("id")Long id){
			public R deleteOtherbuild(@RequestParam("id") Long id) {
			return comMngStructOtherBuildService.deleteOtherbuild(id);
			}

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

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

			/**
			* 评论点赞/取消点赞
			* @param comActEasyPhotoCommentUserDTO 操作
			*
			* @param comActEasyPhotoCommentUserDTO
			* 操作
			* @return 操作结果
			*/
			@PostMapping("commentsign")
			public R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO){
			public R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO) {
			return comActEasyPhotoService.commentSign(comActEasyPhotoCommentUserDTO);
			}

			/**
			* 随手拍--评论--新增评论
			* @param comActEasyPhotoCommentDTO 新增内容
			*
			* @param comActEasyPhotoCommentDTO
			* 新增内容
			* @return 新增结果
			*/
			@PostMapping("addcomacteasyphotocomment")
			public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO){
			public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO) {
			return comActEasyPhotoService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO);
			}

			/**
			* 查询城市下属所有地区列表
			* @param cityAdcode 城市地址编码
			*
			* @param cityAdcode
			* 城市地址编码
			* @return 地区列表
			*/
			@PostMapping("listareadistrict")
			public R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode){
			public R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode) {
			return comMngStructAreaDistrictService.listAreaDistrict(cityAdcode);
			}

			/**
			* 首页图表数据汇总
			* @param communityId 社区id
			*
			* @param communityId
			* 社区id
			* @return 图表数据 IndexDataVO
			*/
			@PostMapping("indexdatacommunitybackstageechart")
			public R indexDataCommunityBackstageEchart(@RequestParam("communityId")Long communityId){
			public R indexDataCommunityBackstageEchart(@RequestParam("communityId") Long communityId) {
			return comActActivityService.indexDataCommunityBackstageEchart(communityId);
			}

			/**
			* 选择导入的小区
			* @param param 小区名字模糊查询
			* @param communityId 社区id
			*
			* @param param
			* 小区名字模糊查询
			* @param communityId
			* 社区id
			* @return 小区集合 ComMngStructAreaVO
			*/
			@PostMapping("listareas")
			public R listAreas(@RequestParam("param")String param, @RequestParam("communityId")Long communityId){
			return comMngStructAreaService.listAreas(param,communityId);
			public R listAreas(@RequestParam("param") String param, @RequestParam("communityId") Long communityId) {
			return comMngStructAreaService.listAreas(param, communityId);
			}

			/**
			* 检查小区是否已经批量设置过房屋并且返回小区房屋门号规则
			* @param id 小区id
			*
			* @param id
			* 小区id
			* @return ComMngStructAreaVO
			*/
			@PostMapping("checkAreaHouse")
			public R checkAreaHouse(@RequestParam("id")Long id){
			public R checkAreaHouse(@RequestParam("id") Long id) {
			return comMngStructAreaService.checkAreaHouse(id);
			}

			/**
			* 新增留言
			* @param comActMessageVO 新增留言信息
			*
			* @param comActMessageVO
			* 新增留言信息
			* @return 发布结果
			*/
			@PostMapping("addmessage")
			public R addMessage(@RequestBody ComActMessageVO comActMessageVO){
			// 微信内容审核
			public R addMessage(@RequestBody ComActMessageVO comActMessageVO) {
			// 微信内容审核
			return comActMessageService.addMessage(comActMessageVO);
			}

			/**
			* 我发的留言
			*
			* @return 结果集合
			*/
			@PostMapping("pagemymessage")
			public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
			public R pageMyMessage(@RequestBody ComActMessageVO comActMessageVO) {
			return comActMessageService.pageMyMessageApplets(comActMessageVO);
			}

			/**
			* 发给我的留言
			*
			* @return 结果集合
			*/
			@PostMapping("pagesendtomemessage")
			public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
			public R pageSendToMessage(@RequestBody ComActMessageVO comActMessageVO) {
			return comActMessageService.pageSendToMessageApplets(comActMessageVO);
			}

			/**
			* 根据id查询留言集合
			*
			* @return 结果集合
			*/
			@PostMapping("pagemessagebyuser")
			public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
			public R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO) {
			return comActMessageService.pageMessageByUserApplets(comActMessageVO);
			}

			/**
			* 社区留言
			*
			* @return 结果集合
			*/
			@PostMapping("pagemycommunitymessage")
			public R pageMyCommunityMessage (@RequestBody ComActMessageVO comActMessageVO){
			public R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO) {
			return comActMessageService.pageMyCommunityMessageApplets(comActMessageVO);
			}

			/**
			* 新增留言回复
			* @param comActMessageBackVO 新增留言回复信息
			*
			* @param comActMessageBackVO
			* 新增留言回复信息
			* @return 发布结果
			*/
			@PostMapping("addmessageback")
			public R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO){
			// 微信内容审核
			public R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO) {
			// 微信内容审核
			return comActMessageService.addMessageBack(comActMessageBackVO);
			}

			@PostMapping("deletemessage")
			public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
			return comActMessageService.deleteMessage(comActMessageVO);
			@@ -1364,7 +1854,8 @@
			/**
			* 留言详情
			*
			* @param id 主键
			* @param id
			* 主键
			* @return 详情内容
			*/
			@PostMapping("detailmessage")
			@@ -1374,6 +1865,7 @@

			/**
			* 导出房屋信息
			*
			* @param areaId
			* @return
			*/
			@@ -1384,8 +1876,11 @@

			/**
			* 查看用户问卷调查详细
			* @param userId 用户ID
			* @param questId 问卷ID
			*
			* @param userId
			* 用户ID
			* @param questId
			* 问卷ID
			* @return 用户问卷调查详细
			*/
			@GetMapping("questnaire/usersanswer")
			@@ -1395,7 +1890,9 @@

			/**
			* 查看问卷调查详细
			* @param questId 问卷ID
			*
			* @param questId
			* 问卷ID
			* @return 用户问卷调查详细
			*/
			@GetMapping("questnaire/view")
			@@ -1404,49 +1901,82 @@
			* 根据用户身份分别返回数据
			*/
			/* 问卷参与者，已提交问卷则返回问卷详细，否则返回空的问卷 */
			boolean isMember = true;//默认情况下，可不做逻辑判断，直接查询返回用户答卷
			if(isMember) {
			boolean isMember = true;// 默认情况下，可不做逻辑判断，直接查询返回用户答卷
			if (isMember) {
			return comActQuestnaireService.answerInfoQuestnaire(userId, questId);
			}else {
			} else {
			/非问卷参与者返回问卷“预览” /
			return comActQuestnaireService.infoQuestnaire(questId);
			}
			}


			/**
			* 新增社区问卷
			* @param questnaireVO
			* @return
			* 小程序-问卷调查详情
			*
			* @param userId
			* 用户id
			* @param questId
			* 问卷id
			* @return 问卷调查详情
			*/
			@Transactional(rollbackFor = Exception.class)
			@PostMapping("questnaire/addquestnaire")
			public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
			return comActQuestnaireService.addQuestnaire(questnaireVO, communityId, userId);
			@GetMapping("questnaire/view/detail")
			public R viewDetail(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId) {
			return comActQuestnaireService.getQuesDetail(questId, userId);
			}

			/**
			* 社区问卷列表
			* @param pageQuestnaireDTO
			* 社区后台-查询问卷调查详情
			*
			* @param questId
			* 问卷id
			* @return 问卷调查详情
			*/
			@GetMapping("questnaire/admin/detail")
			public R quesDetail(@RequestParam("questId") Long questId) {
			return comActQuestnaireService.getQuesDetailAdmin(questId);
			}

			/**
			* 新增社区问卷
			*
			* @param questnaireVO
			* @return
			*/
			@PostMapping("questnaire/addquestnaire")
			public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
			return comActQuestnaireService.addQuestnaire(questnaireVO);
			}

			/**
			* 小程序-社区问卷列表
			*
			* @param pageQuestnaireDTO
			* 请求参数
			* @return 社区问卷列表
			*/
			@PostMapping("questnaire/pagequestnaire")
			public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
			if(pageQuestnaireDTO.getForParty()==null){
			pageQuestnaireDTO.setForParty(false);
			}
			if(pageQuestnaireDTO.getForVolunteer()==null){
			pageQuestnaireDTO.setForVolunteer(false);
			}
			return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
			public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
			return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO);
			}

			/**
			* 社区后台-社区问卷列表
			*
			* @param pageQuestnaireDTO
			* 请求参数
			* @return 社区问卷列表
			*/
			@PostMapping("questnaire/admin/pagequestnaire")
			public R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
			return comActQuestnaireService.pageQuestnaireAdmin(pageQuestnaireDTO);
			}

			/**
			* 编辑问卷——问卷、题目、选项
			*
			* @param questnaireVO
			* @return
			*/
			@Transactional(rollbackFor = Exception.class)
			@PostMapping("questnaire/editquestnaire")
			public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
			return comActQuestnaireService.editQuestnaire(questnaireVO);
			@@ -1454,28 +1984,33 @@

			/**
			* 修改问卷状态
			*
			* @param editComActQuestnaireVo
			* @return
			*/
			@PostMapping("questnaire/editquestnairedo")
			public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId) {
			return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo, userId);
			public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
			return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo);
			}

			/**
			* 删除问卷 ——隐藏
			* @param questId 调查问卷Id
			* 删除问卷 ——隐藏
			*
			* @param questId
			* 调查问卷Id
			* @return
			*/
			@Transactional(rollbackFor = Exception.class)
			@PostMapping("questnaire/deletequestnaire")
			public R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
			return comActQuestnaireService.deleteQuestnaire(questId,userId);
			public R editQuestnaireDO(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId) {
			return comActQuestnaireService.deleteQuestnaire(questId, userId);
			}

			/**
			* 查看用户问卷调查统计信息
			* @param questId 问卷ID
			*
			* @param questId
			* 问卷ID
			* @return 用户问卷调查统计信息
			*/
			@GetMapping("questnaire/stat")
			@@ -1486,108 +2021,129 @@
			/**
			* 问卷答题结果
			*
			* @param questId 问卷ID
			* @param questId
			* 问卷ID
			*/
			@PostMapping("questnaire/answerslist")
			public R answerResultList(@RequestParam("questId")Long questId){
			return comActQuestnaireService.answerResultList(questId);
			public R answerResultList(@RequestParam("questId") Long questId) {
			return comActQuestnaireService.answerResultList(questId);
			}

			/**
			* 问卷题目答卷信息
			*
			* @param pageQuestnaireSubDetailsDTO 问卷ID
			* @param pageQuestnaireSubDetailsDTO
			* 问卷ID
			*/
			@PostMapping("questnaire/qaqeustanswerdetails")
			public R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO){
			public R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
			return comActQuestnaireService.qaQeustDetails(pageQuestnaireSubDetailsDTO);
			}

			/**
			* 社区问卷回答用户分页
			*
			* @param pageQuestnaireAnswerDTO
			* @return 分页数据
			*/
			@PostMapping("questnaire/pagequestnaireanswer")
			public R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO){
			public R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO) {
			return comActQuestnaireService.pageQuestnaireAnswer(pageQuestnaireAnswerDTO);
			}

			/**
			* 居民填写问卷调查问卷
			* @param usersAnswerQuestnaireVO
			* 居民填写问卷调查问卷questnaire/pagequestnaire
			*/
			@PostMapping("questnaire/usersanswequestnaire")
			public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
			return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
			public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
			return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
			}

			/**
			* 小程序-用户弹窗添加不在提醒接口
			*
			* @param questId
			* 问卷id
			* @param userId
			* 用户id
			* @return 添加结果
			*/
			@GetMapping("questnaire/add/noNotice")
			public R addNoNotice(@RequestParam("questId") Long questId, @RequestParam("userId") Long userId) {
			return comActQuestnaireService.addNoNotice(questId, userId);
			}

			/**
			* 删除微心愿
			*
			* @param id
			* @return
			*/
			@PostMapping("deletemicrowish")
			public R deletemicrowish(@RequestParam("id") Long id){
			public R deletemicrowish(@RequestParam("id") Long id) {
			return comActMicroWishService.deleteMicroWish(id);
			}




			/**
			* 新增高龄认证
			*
			* @param eldersAuthAddDTO
			* @return 新增结果
			*/
			@PostMapping("/eldersauth/add")
			R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO){
			R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO) {
			return eldersAuthService.add(eldersAuthAddDTO);
			};
			}

			/**
			* 修改高龄认证
			*
			* @param eldersAuthEditDTO
			* @return 维护结果
			*/
			@PostMapping("/eldersauth/edit")
			R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO){
			R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO) {
			return eldersAuthService.edit(eldersAuthEditDTO);
			};
			}

			/**
			* 分页查找高龄认证
			*
			* @param pageEldersAuthDTO
			* @return 维护结果
			*/
			@PostMapping("/eldersauth/page")
			R<IPage<EldersAuthVO>> query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
			R<IPage<EldersAuthVO>> query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO) {
			return eldersAuthService.query(pageEldersAuthDTO);
			};
			}

			/**
			* 删除高龄认证
			*
			* @param EldersAuthDeleteDTO
			* @return 平台用户信息
			*/
			@PostMapping("/eldersauth/delete")
			R delete(@RequestBody EldersAuthDeleteDTO EldersAuthDeleteDTO){
			R delete(@RequestBody EldersAuthDeleteDTO EldersAuthDeleteDTO) {
			return eldersAuthService.delete(EldersAuthDeleteDTO);
			};
			}

			/**
			* 查询高龄认证详细信息
			* @param id 高龄认证 id
			*
			* @param id
			* 高龄认证 id
			* @return 查找结果
			*/
			@PostMapping("/eldersauth/{id}")
			R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id){
			R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id) {
			return eldersAuthService.eldersAuthDetails(id);
			};
			}

			@PostMapping("/eldersauth/getMyfamilyElders/{userId}")
			R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId){
			R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId) {
			List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(userId);


			List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
			list.forEach(rt -> {
			int age = IdCard.IdNOToAge(rt.getIdCard());
			@@ -1601,95 +2157,103 @@

			@PostMapping("/eldersauth/addByFamilyUser")
			@Transactional(rollbackFor = Exception.class)
			R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
			R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO) {

			ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
			if(authUserDO == null){
			if (authUserDO == null) {
			return R.fail("未查询到老人信息");
			}

			Long elderId = authUserDO.getId();
			boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
			if(!canReAuthThisMonth){
			return R.fail("当月已认证，不能再次进行认证");
			}

			//根据身份证获取出生日期并获取岁数
			String idCard = authUserDO.getIdCard();

			Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
			EldersAuthDO eldersAuthDO = new EldersAuthDO();
			eldersAuthDO.setSumitUserId(loginUserId);
			eldersAuthDO.setCreateBy(loginUserId);
			eldersAuthDO.setCreateAt(new Date());
			eldersAuthDO.setIdCard(idCard);
			eldersAuthDO.setAuthUserName(authUserDO.getName());
			eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
			eldersAuthDO.setFamilyUserId(authUserDO.getId());
			eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
			//根据身份证查询出籍贯出生日期
			//String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
			String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
			if(StringUtils.isEmpty(domicile)){
			domicile = "暂无";
			}

			Date birthDay = IdCard.birthDay(idCard);
			eldersAuthDO.setDomicile(domicile);
			eldersAuthDO.setBirthDay(birthDay);
			int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
			if(add==1){
			//设置认证成功
			Long familyUserId = eldersAuthDO.getFamilyUserId();
			ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
			comEldersAuthUserDO.setId(familyUserId);
			comEldersAuthUserDO.setIsAuth(1);
			boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
			if(!updated){
			throw new ServiceException("添加认证失败，更新认证状态");
			}
			//认证成功添加认证记录
			List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
			.lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,idCard).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
			if(authHistoryRecordDOList.isEmpty()){
			ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
			authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
			authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
			BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
			authHistoryRecordDO.setId(null);
			authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
			authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
			authHistoryRecordDO.setIsAuth(1);
			authHistoryRecordDO.setDomicile(domicile);
			comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
			}
			return R.ok(eldersAuthDO.getId());
			}
			long year=DateUtil.betweenYear(birthDay,DateUtil.date(),true);
			if(authUserDO.getBigAgeId()!=null){
			ComEldersAuthElderlyDO comEldersAuthElderlyDO=comEldersAuthElderlyService.getById(authUserDO.getBigAgeId());
			if(comEldersAuthElderlyDO!=null&&comEldersAuthElderlyDO.getIsExist()==ComEldersAuthElderlyDO.isExist.yes&&comEldersAuthElderlyDO.getIsBigAge()==ComEldersAuthElderlyDO.isBigAge.yes&&year>=80){
			Long elderId = authUserDO.getId();
			boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
			if (!canReAuthThisMonth) {
			return R.fail("当月已认证，不能再次进行认证");
			}
			Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
			EldersAuthDO eldersAuthDO = new EldersAuthDO();
			eldersAuthDO.setSumitUserId(loginUserId);
			eldersAuthDO.setCreateBy(loginUserId);
			eldersAuthDO.setCreateAt(new Date());
			eldersAuthDO.setIdCard(idCard);
			eldersAuthDO.setAuthUserName(authUserDO.getName());
			eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
			eldersAuthDO.setFamilyUserId(authUserDO.getId());
			eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
			// 根据身份证查询出籍贯出生日期
			// String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
			String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
			if (StringUtils.isEmpty(domicile)) {
			domicile = "暂无";
			}
			eldersAuthDO.setDomicile(domicile);
			eldersAuthDO.setBirthDay(birthDay);
			int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
			if (add == 1) {
			// 设置认证成功
			Long familyUserId = eldersAuthDO.getFamilyUserId();
			ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
			comEldersAuthUserDO.setId(familyUserId);
			comEldersAuthUserDO.setIsAuth(1);
			boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
			if (!updated) {
			throw new ServiceException("添加认证失败，更新认证状态");
			}
			// 认证成功添加认证记录
			List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList =
			comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>().lambda()
			.eq(ComEldersAuthHistoryRecordDO::getIdCard, idCard)
			.ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
			if (authHistoryRecordDOList.isEmpty()) {
			ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
			authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
			authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
			BeanUtils.copyProperties(eldersAuthDO, authHistoryRecordDO);
			authHistoryRecordDO.setId(null);
			authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
			authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
			authHistoryRecordDO.setIsAuth(1);
			authHistoryRecordDO.setDomicile(domicile);
			comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
			}
			return R.ok(eldersAuthDO.getId());
			}

			return R.fail();
			}
			return R.fail("不满足认证条件");
			}
			return R.fail("未查询到高龄老人库数据");
			}

			/**
			* 新增高龄认证社区反馈
			* @param {classNameFirstLower}AddDTO 添加高龄认证社区反馈传递对象
			*
			* @param {classNameFirstLower}AddDTO
			* 添加高龄认证社区反馈传递对象
			* @return 新增结果
			*/
			@PostMapping("/eldersauth/addFeedback")
			R add(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
			R add(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO) {
			ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO);
			EldersAuthDO eldersAuthDO = eldersAuthService.getBaseMapper().selectById(eldersAuthFeedbackAddDTO.getAuthId());
			if(eldersAuthDO==null){
			if (eldersAuthDO == null) {
			return R.fail("认证记录不存在");
			}
			R addR = eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
			if(R.isOk(addR)){
			SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
			if (R.isOk(addR)) {
			SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
			sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
			sysUserNoticeVO.setType(3);
			sysUserNoticeVO.setTitle("高龄认证社区反馈");
			sysUserNoticeVO.setBusinessType(13);
			sysUserNoticeVO.setBusinessTitle(" ");
			sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区反馈:"
			+ eldersAuthFeedbackAddDTO.getFeedBack());
			sysUserNoticeVO.setBusinessContent(
			"你提交【" + eldersAuthDO.getAuthUserName() + "】的高龄认证，社区反馈:" + eldersAuthFeedbackAddDTO.getFeedBack());
			sysUserNoticeVO.setBusinessId(eldersAuthDO.getId());
			sysUserNoticeVO.setStatus(0);
			sysUserNoticeVO.setBusinessStatus(2);
			@@ -1697,30 +2261,452 @@
			if (R.isOk(r1)) {
			log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
			}
			}

			// 用户高龄认证反馈，推送订阅消息给用户
			Map<String, String> map = comActActSignDAO.getUserOpenId(eldersAuthDO.getSumitUserId());
			if (map != null) {
			String openid = map.get("openid");
			try {
			WxXCXTempSend util = new WxXCXTempSend();
			R<SysTemplateConfigVO> sysTemplateConfigVO=userService.selectTemplate(eldersAuthFeedbackAddDTO.getAreaCode(),5);
			String accessToken = util.getAccessToken();
			WxUtil.sendSubscribeRZSH(openid, accessToken, "高龄认证",
			DateUtils.format(eldersAuthDO.getCreateAt(), DateUtils.ymdhms_format),
			eldersAuthFeedbackAddDTO.getFeedBack(),sysTemplateConfigVO.getData().getTemplateId());
			} catch (Exception e) {
			log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
			}
			}
			}
			return addR;
			}


			/**
			* 查询导出高龄老人
			*
			* @param pageEldersAuthDTO
			* @return
			*/
			@PostMapping("/eldersauth/eldersAuthQuery")
			R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
			R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO) {
			return eldersAuthService.queryExportData(pageEldersAuthDTO);
			}

			/**
			* 设置社区认证方式
			* @param communityId 社区ID
			* @param type 核验类型（1.视频认证 2.人脸核验）
			*
			* @param communityId
			* 社区ID
			* @param type
			* 核验类型（1.视频认证 2.人脸核验）
			* @return
			*/
			@PostMapping("/elders/setCommunityAuthType")
			R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
			R setCommunityAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
			return eldersAuthService.setCommunityAuthType(communityId, type);
			}

			/**
			* 随手拍活动定时任务
			*
			* @return 执行结果
			*/
			@PostMapping("timeTaskEasyPhotoActivity")
			public R timeTaskEasyPhotoActivity() {
			return comActEasyPhotoActivityService.timeTaskEasyPhotoActivity();
			}

			/**
			* 社区随手拍列表统计
			*
			* @param communityId
			* 社区id
			* @return 统计结果
			*/
			@GetMapping("easyphoto/statistics")
			public R easyPhotoStatistics(@RequestParam("communityId") Long communityId) {
			return comActEasyPhotoService.easyPhotoStatistics(communityId);
			}

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

			/**
			* 查询西区社区列表
			*
			* @return 社区列表
			*/
			@GetMapping("/eventgrid/community/westList")
			public R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode) {
			return comActService.getWestCommunityLists(areaCode);
			}

			/**
			* 随手拍发放奖励
			*
			* @param grantRewardDTO
			* 请求参数
			* @return 发放结果
			*/
			@PostMapping("/easyphoto/grantReward")
			public R grantReward(@RequestBody GrantRewardDTO grantRewardDTO) {
			return comActEasyPhotoService.grantReward(grantRewardDTO);
			}

			/**
			* 获取最新活动和用户最新收益
			*
			* @param userId
			* 用户id
			* @param communityId
			* 社区id
			* @return 最新活动和用户最新收益
			*/
			@PostMapping("easyphoto/getUserReward")
			public R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
			return comActEasyPhotoService.getUserReward(userId, communityId);
			}

			/**
			* 获取首页弹窗接口
			*
			* @param userId
			* 用户id
			* @param communityId
			* 社区id
			* @return 首页弹窗接口
			*/
			@PostMapping("easyphoto/getUserRewards")
			public R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId) {
			return comActEasyPhotoService.getUserReward(userId, communityId);
			}

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

			/**
			* 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
			*/
			@PostMapping("timedTaskActivityNotice")
			public R timedTaskActivityNotice() {
			return comActActivityService.timedTaskActivityNotice();
			}

			/**
			* 问卷调查统计汇总
			*
			* @param summaryDTO
			* 请求参数
			* @return 统计汇总
			*/
			@PostMapping("questnaire/statisticsSummary")
			public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
			return comActQuestnaireService.statisticsSummary(summaryDTO);
			}

			/**
			* 问卷调查统计汇总导出数据查询
			*
			* @param questId
			* 调查问卷id
			* @return 调查统计汇总导出数据
			*/
			@GetMapping("questnaire/statisticsSummary/export")
			public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
			return comActQuestnaireService.statisticsSummaryExport(questId);
			}

			/**
			* 问卷调查统计汇总表头统计
			*
			* @param questId
			* 调查问卷id
			* @return 问卷调查统计汇总表头统计数据
			*/
			@GetMapping("questnaire/statisticsSummary/header")
			public R statisticsSummaryHeader(@RequestParam("questId") Long questId,
			@RequestParam("communityId") Long communityId) {
			return comActQuestnaireService.statisticsSummaryHeader(questId, communityId);
			}

			/**
			* 定时任务检测待发布，调研中的问卷调查状态
			*/
			@PostMapping("timedTaskQuestionnaire")
			public R timedTaskQuestionnaire() {
			return comActQuestnaireService.timedTaskQuestionnaire();
			}

			/**
			* 定时任务针对活动结束后7天还未评价的用户默认好评
			*/
			@PostMapping("activity/default-praise")
			public R timedTaskActivityDefaultPraise() {
			return comActActEvaluateService.timedTaskActivityDefaultPraise();
			}

			/**
			* 小程序-新增问卷调查浏览数量
			*
			* @param questId
			* 问卷调查id
			* @return 增加结果
			*/
			@GetMapping("questnaire/add/view")
			public R addQuestnaireView(@RequestParam("questId") Long questId) {
			return comActQuestnaireService.addQuestnaireView(questId);
			}

			/**
			* 社区后台-切换随手拍公示状态
			*
			* @param comActEasyPhotoVO
			* 请求参数
			* @return 切换结果
			*/
			@PostMapping("easyphoto/switch/publicity")
			public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
			return comActEasyPhotoService.easyPhotoSwitchPublicity(comActEasyPhotoVO);
			}

			/**
			* 查询社区待处理随手拍id集合
			*
			* @param communityId
			* 社区id
			* @return 社区待处理随手拍id集合
			*/
			@GetMapping("easyphoto/noHandle/list")
			public R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId) {
			return comActEasyPhotoService.easyPhotoNoHandleList(communityId);
			}

			/**
			* 微心愿处理人列表
			* @param communityId 社区id
			* @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
			* @return 处理人列表
			*/
			@GetMapping("wish/handle/list/admin")
			public R wishHandleListAdmin(@RequestParam(value = "communityId") Long communityId,@RequestParam("type") Integer type){
			return R.ok(comActMicroWishService.wishHandleListAdmin(communityId,type));
			}

			/**
			* 社区后台分页查询微心愿
			* @param comActMicroWishVO 请求参数
			* @return 微心愿列表
			*/
			@PostMapping("pagemicrowishAdmin")
			public R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO) {
			return comActMicroWishService.pageMicroWishAdmin(comActMicroWishVO);
			}

			/**
			* 活动报名签到情况
			* @param id 活动主键id
			* @return
			*/
			@GetMapping("activity/sign-in/list")
			public R listSignInRecord(@RequestParam("id") Long id) {
			return comActActivityService.listSignInRecord(id);
			}

			/**
			* 活动签到记录
			* @param id 活动主键
			* @param userId 用户id
			* @return
			*/
			@GetMapping("activity/regist/list")
			public R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
			return comActActivityService.listRegistRecord(id, userId);
			}

			/**
			* 获取活动类型（目前只有志愿者活动需要获取）
			* @param communityId
			* @param type
			* @return
			*/
			@GetMapping("activity/type/list")
			public R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
			return comActActivityService.listActivityType(communityId, type);
			}

			/**
			* 添加活动类型
			* @param comActActivityTypeVO
			* @return
			*/
			@PostMapping("activity/type/add")
			public R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO) {
			return comActActivityService.addActivityType(comActActivityTypeVO);
			}

			/**
			* 我的评价
			* @param userId
			* @param activityId 活动id
			* @return
			*/
			@GetMapping("activity/my-evaluate")
			public R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId) {
			return comActActEvaluateService.listMyActivityEvaluate(userId, activityId);
			}

			/**
			* 志愿者导入
			*
			* @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
			* @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);
			}
			}