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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

@@ -9,6 +9,7 @@
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.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -20,6 +21,7 @@
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
@@ -34,10 +36,7 @@

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.*;
import java.util.stream.Collectors;

/**
@@ -82,6 +81,8 @@
    private EldersAuthService eldersAuthService;
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    @Resource
    public ComEldersAuthUserService comEldersAuthUserService;
    @Resource
@@ -1420,32 +1421,56 @@
        }
    }

    /**
     * 小程序-问卷调查详情
     * @param userId    用户id
     * @param questId   问卷id
     * @return  问卷调查详情
     */
    @GetMapping("questnaire/view/detail")
    public R viewDetail(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
        return comActQuestnaireService.getQuesDetail(questId,userId);
    }

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


    /**
     * 新增社区问卷
     * @param questnaireVO
     * @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);
    public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
        return comActQuestnaireService.addQuestnaire(questnaireVO);
    }

    /**
     * 社区问卷列表
     * @param pageQuestnaireDTO
     * @return
     * 小程序-社区问卷列表
     * @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);
    }

    /**
@@ -1453,7 +1478,6 @@
     * @param questnaireVO
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("questnaire/editquestnaire")
    public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
        return comActQuestnaireService.editQuestnaire(questnaireVO);
@@ -1465,8 +1489,8 @@
     * @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);
    }

    /**
@@ -1520,12 +1544,11 @@
    }

    /**
     * 居民填写问卷调查问卷
     * @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);
    }

    /**
@@ -1704,8 +1727,21 @@
            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();
                    String accessToken = util.getAppAccessToken();
                    WxUtil.sendSubscribeRZSH(openid,accessToken,"高龄认证"
                            ,DateUtils.format(eldersAuthDO.getCreateAt(),DateUtils.ymdhms_format),eldersAuthFeedbackAddDTO.getFeedBack());
                }catch (Exception e){
                    log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
                }
            }
        }
        return addR;
    }

@@ -1790,5 +1826,32 @@
        return comActEasyPhotoService.readUserReward(userId,communityId);
    }

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


    @PostMapping("questnaire/statisticsSummary")
    public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
        return comActQuestnaireService.statisticsSummary(summaryDTO);
    }

    @GetMapping("questnaire/statisticsSummary/export")
    public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
        return comActQuestnaireService.statisticsSummaryExport(questId);
    }

    @GetMapping("questnaire/statisticsSummary/header")
    public R statisticsSummaryHeader(@RequestParam("questId") Long questId) {
        return comActQuestnaireService.statisticsSummaryHeader(questId);
    }

    @PostMapping("timedTaskQuestionnaire")
    public R timedTaskQuestionnaire(){
        return comActQuestnaireService.timedTaskQuestionnaire();
    }
}