Merge branch 'test' into 'test_bak'

罗元桥

2021-09-26 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8

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

@@ -6,6 +6,10 @@

import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import com.panzhihua.service_community.service.*;
@@ -49,6 +53,8 @@
    private ComElderAuthRecordsService comElderAuthRecordsService;
    @Resource
    private ComPensionAuthRecordService comPensionAuthRecordService;
    @Resource
    private ComPensionAuthHistoryRecordService comPensionAuthHistoryRecordService;

    @PostMapping("/getAuth")
    public R getAuth(@RequestParam("authUserId") Long authUserId) {
@@ -166,8 +172,8 @@
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    @PostMapping("/authtype")
    R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
    @PostMapping("/authType")
    public R elderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        return eldersAuthService.communityAuthType(eldersAuthTypeQueryDTO);
    }

@@ -291,7 +297,7 @@
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/statistic/export")
    public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO){
    public R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO){
        return comElderAuthRecordsService.exportElderAuthRecordsStatistic(pageElderAuthRecordsDTO);
    }

@@ -384,6 +390,31 @@
    }

    /**
     * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType  设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
     * @param    communityId   社区id
     * @param    type         检验类型
     * @return    R  设置结果
     * @author txb
     * @date 2021/9/10 16:03
     */
    @PutMapping("/pensionAuthRecords/authType/{type}")
    public R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
        return comPensionAuthRecordService.setPensionAuthType(communityId, type);
    }

    /**
     * 查询养老认证社区认证方式 setPensionAuthType  查询养老认证社区认证方式
     * @param    eldersAuthTypeQueryDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/10 16:03
     */
    @PostMapping("/pensionAuthRecords/authtype")
    public R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        return comPensionAuthRecordService.communityPensionAuthType(eldersAuthTypeQueryDTO);
    }

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * @return  执行结果
     */
@@ -401,5 +432,89 @@
        return comPensionAuthRecordService.timedTaskPensionAuthStatisticsJobHandler();
    }

    /**
     * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
     * @param    communityId   社区id
     * @param    type         检验类型
     * @return    R  设置结果
     * @author txb
     * @date 2021/9/10 16:03
     */
    @PutMapping("/new/authType/{type}")
    public R setAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type) {
        return eldersAuthService.setAuthType(communityId, type);
    }

    /**
     * 查询养老认证社区认证方式 setPensionAuthType  查询养老认证社区认证方式
     * @param    eldersAuthTypeQueryDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/10 16:03
     */
    @PostMapping("/new/authtype")
    public R communityAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        return eldersAuthService.getAuthType(eldersAuthTypeQueryDTO);
    }

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    @PostMapping("/auth/statistic/page")
    public R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO) {
        return eldersAuthService.pageAuthStatisticAdmin(pageElderAuthStatisticDTO);
    }

    /**
     * 高龄认证统计-标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @PostMapping("/auth/statistic/sign")
    public R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO) {
        return eldersAuthService.signAuthStatisticAdmin(signElderAuthStatisticDTO);
    }

    /**
     * 高龄认证统计-统计表头数据
     * @param statisticHeaderDTO 请求参数
     * @return  统计表头数据
     */
    @PostMapping("/auth/header/statistic")
    public R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO) {
        return eldersAuthService.getAuthHeaderStatisticAdmin(statisticHeaderDTO);
    }

    /**
     * 养老认证统计-分页查询
     * @param pensionAuthStatisticDTO   请求参数
     * @return  养老认证统列表
     */
    @PostMapping("/pension/auth/statistic/page")
    public R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO) {
        return comPensionAuthHistoryRecordService.pagePensionAuthStatisticAdmin(pensionAuthStatisticDTO);
    }

    /**
     * 养老认证记标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @PostMapping("/pension/auth/statistic/sign")
    public R signPensionAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO) {
        return comPensionAuthHistoryRecordService.signPensionAuthStatisticAdmin(signElderAuthStatisticDTO);
    }

    /**
     * 养老认证表头统计
     * @param statisticHeaderDTO    请求参数
     * @return  统计结果
     */
    @PostMapping("/pension/auth/header/statistic")
    public R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO) {
        return comPensionAuthHistoryRecordService.getPensionAuthHeaderStatisticAdmin(statisticHeaderDTO);
    }

}