Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 4d74cda64ed8f82ce8744270a21f87dfe2da57c6

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

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

@@ -4,23 +4,28 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
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.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.*;

import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -133,9 +138,9 @@
                        return R.fail("保存奖品失败");
                    }
                }
            } else if (hasPrize.intValue() == 0) {
            }else if(hasPrize.intValue() == 0){
                boolean remove = comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
                log.info("删除社区活动奖品结果【{}】，社区活动id【{}】", remove, actActivityVOId);
                log.info("删除社区活动奖品结果【{}】，社区活动id【{}】",remove,actActivityVOId);
            }
        }
        return r;
@@ -183,9 +188,9 @@
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    Integer participantMax = comActActivityVO1.getParticipantMax();
                    if (participantMax.intValue() == 0) {
                    if (participantMax.intValue()==0) {
                        comActActivityVO1.setType(1);
                    } else {
                    }else{
                        comActActivityVO1.setType(2);
                    }
                });
@@ -198,13 +203,12 @@

    /**
     * 社区后台分页查询社区活动
     *
     * @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);
    }

    /**
@@ -255,13 +259,13 @@
        activitySignVO.setActivityId(id);
        R r = comActActivityService.listActivitySign(activitySignVO);
        if (R.isOk(r)) {
            List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ActivitySignVO.class);
            List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class);
            if (!ObjectUtils.isEmpty(activitySignVOS)) {
                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));
                    if (size>=6) {
                        comActActivityVO.setActivityVolunteerList(collect.subList(0,6));
                    } else {
                        comActActivityVO.setActivityVolunteerList(collect);
                    }
@@ -269,8 +273,8 @@
                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));
                    if (size>=6) {
                        comActActivityVO.setActivitySignVOList(collect1.subList(0,6));
                    } else {
                        comActActivityVO.setActivitySignVOList(collect1);
                    }
@@ -341,10 +345,10 @@
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        Integer isTopping = comActDynVO.getIsTopping();
        boolean b = isTopping.intValue() == 1;
        if (b) {
        if(b){
            ComActDynDO comActDynDO1 = comActDynService.getById(id);
            Integer status = comActDynDO1.getStatus();
            if (status.intValue() == 0) {
            if (status.intValue()==0) {
                return R.fail("该动态还未发布");
            }
        }
@@ -604,7 +608,7 @@
    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;
@@ -669,7 +673,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);
@@ -700,17 +704,17 @@
     */
    @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();
            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("添加房屋失败");
                }
            }
@@ -755,149 +759,136 @@

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

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

    /**
     * 增加志愿者
     *
     * @param comMngVolunteerMngVO 志愿者信息
     * @return 增加结果
     */
    @PostMapping("addvolunteer")
    R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
    R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.addVolunteer(comMngVolunteerMngVO);
    }

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

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

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

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

    /**
     * 志愿者审核详情
     *
     * @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 审核操作
     * @return 审核结果
     */
    @PostMapping("putvolunteerexamine")
    public R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO) {
    public R putVolunteerExamine(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
        return comMngVolunteerMngService.putVolunteerExamine(comMngVolunteerMngVO);
    }

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

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

    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     *
     * @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 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("用户没有绑定小区");
            }
        }
@@ -906,12 +897,11 @@

    /**
     * 新增房屋
     *
     * @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("用户没有绑定小区");
@@ -923,58 +913,53 @@

    /**
     * 查询小区
     *
     * @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
     * @return 活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId) {
    public R listActivity(@RequestParam("userId")Long  userId ){
        return comActActivityService.listActivity(userId);
    }

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

    /**
     * 建筑类型
     *
     * @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 操作结果
     * @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());
        }
@@ -983,50 +968,46 @@

    /**
     * 社区详情
     *
     * @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
     * @return 小区信息
     */
    @PostMapping("detailarea")
    public R detailArea(@RequestParam("areaId") Long areaId) {
    public R detailArea(@RequestParam("areaId")Long areaId){
        return comMngStructAreaService.detailArea(areaId);
    }

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

    /**
     * 志愿者详情
     *
     * @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);
        }
@@ -1035,35 +1016,33 @@

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

    /**
     * 社区管理后台数据看板 代办事件
     *
     * @param communityId 社区id
     * @param userId      登录用户信息
     * @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);
@@ -1074,251 +1053,221 @@

    /**
     * 删除社区
     *
     * @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();
    }

    /**
     * 其他建筑详情
     *
     * @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 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putotherbuild")
    public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
    public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
        return comMngStructOtherBuildService.putOtherbuild(comMngStructOtherBuildVO);
    }

    /**
     * 删除其他建筑
     *
     * @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 查询参数
     * @return 返回结果
     */
    @PostMapping("pageeasyphotoapplets")
    public R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
    public R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }

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

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

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

    /**
     * 查询城市下属所有地区列表
     *
     * @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
     * @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 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
     * @return ComMngStructAreaVO
     */
    @PostMapping("checkAreaHouse")
    public R checkAreaHouse(@RequestParam("id") Long id) {
    public R checkAreaHouse(@RequestParam("id")Long id){
        return comMngStructAreaService.checkAreaHouse(id);
    }

    /**
     * 新增留言
     *
     * @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 comActMessageVO 新增留言回复信息
     * @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);
    }

    
    @PostMapping("resetmessagepublic")
    public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {
        return comActMessageService.resetMessagePublic(resetComActMessageVO);
    }

    
    /**
     * 留言详情
     *
@@ -1332,7 +1281,6 @@

    /**
     * 导出房屋信息
     *
     * @param areaId
     * @return
     */
@@ -1343,8 +1291,7 @@

    /**
     * 查看用户问卷调查详细
     *
     * @param userId  用户ID
     * @param userId 用户ID
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
@@ -1354,59 +1301,13 @@
    }

    /**
     * 新增社区问卷
     *
     * @param questnaireVO
     * @return
     * 查看用户问卷调查详细
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
    @PostMapping("questnaire/addquestnaire")
    public R answerInfoQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
        return comActQuestnaireService.addQuestnaire(questnaireVO, communityId, userId);
    @GetMapping("questnaire/view")
    public R view(@RequestParam("questId") Long questId) {
        return comActQuestnaireService.infoQuestnaire(questId);
    }

    /**
     * 社区问卷列表
     *
     * @param pageQuestnaireDTO
     * @return
     */
    @PostMapping("questnaire/pagequestnaire")
    public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
        return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO);
    }

    /**
     * 编辑问卷——问卷、题目、选项
     *
     * @param questnaireVO
     * @return
     */
    @PostMapping("questnaire/editquestnaire")
    public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
        return comActQuestnaireService.editQuestnaire(questnaireVO);
    }

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

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


}

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

@@ -177,21 +177,21 @@
    }

    @Override
    public R statQuestnaire(Long questId) {
    public R statQuestnaire(Long questId){
        return null;
    }

    @Override
    public R infoQuestnaire(Long questId) {
        return null;
        return answerInfoQuestnaire(null, questId);
    }

    @Override
    public R answerInfoQuestnaire(Long userId, Long questId) {

        ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
        if (comActQuestnaireDO == null) {
            return R.fail("问卷不存在!");
        if(comActQuestnaireDO==null){
            return  R.fail("问卷不存在!");
        }

        UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
@@ -203,7 +203,7 @@
        list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort).reversed());
        List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();

        list.forEach(comActQuestnaireSubDO -> {
        list.forEach(comActQuestnaireSubDO ->{
                    UsersSubAnswerVO usersSubAnswerVO = new UsersSubAnswerVO();
                    //问卷调查题目
                    ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
@@ -224,18 +224,20 @@
                    });
                    usersSubAnswerVO.setQuestSelectionList(comActQuestnaireSubSelectionVOs);
                    //用户回答
                    List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
                            questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
                                    .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));
                    if(userId!=null) {
                        List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
                                questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
                                        .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));

                    List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
                    questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO -> {
                        ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
                        BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
                        questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);
                    });
                        List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
                        questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO -> {
                            ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
                            BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
                            questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);
                        });

                    usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
                        usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
                    }
                    usersSubAnswerVOList.add(usersSubAnswerVO);
                }
        );