Merge branch 'test' into 'master'

罗元桥

2021-09-06 0757d223c5f11f5f927a3b9040d7e387b40c469a

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

@@ -4,15 +4,18 @@

import javax.annotation.Resource;

import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import com.panzhihua.service_community.service.ComElderAuthRecordsService;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -43,6 +46,10 @@
    private ComEldersAuthUserService comEldersAuthUserService;
    @Resource
    private EldersAuthService eldersAuthService;
    @Resource
    private ComEldersAuthElderlyService comEldersAuthElderlyService;
    @Resource
    private ComElderAuthRecordsService comElderAuthRecordsService;

    @PostMapping("/getAuth")
    public R getAuth(@RequestParam("authUserId") Long authUserId) {
@@ -51,12 +58,28 @@
        if (authUserDO == null) {
            return R.fail("未查询到老人信息");
        }

        //判断当前提交用户是否符合认证条件
        ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyService.getOne(new QueryWrapper<ComEldersAuthElderlyDO>()
                .lambda().eq(ComEldersAuthElderlyDO::getId,authUserDO.getBigAgeId()));
        if(authElderlyDO == null){
            return R.fail("未查询到老人信息");
        }

        int age = IdcardUtil.getAgeByIdCard(authElderlyDO.getIdCard());
        if(age < 80 || authElderlyDO.getIsBigAge().equals(ComEldersAuthElderlyDO.isBigAge.no)
                || authElderlyDO.getIsExist().equals(ComEldersAuthElderlyDO.isExist.no)){
            return R.fail("未满足认证条件");
        }

        if (authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)) {
            List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>().lambda()
                .eq(EldersAuthDO::getType, 2).ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
                .eq(EldersAuthDO::getType, 2).eq(EldersAuthDO::getFamilyUserId,authUserId)
                    .ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
            if (!eldersAuthDOList.isEmpty()) {
                return R.fail("该老人已认证");
            }

        }
        ComElderAuthUserDetailVO authUserDetailVO = new ComElderAuthUserDetailVO();
        BeanUtils.copyProperties(authUserDO, authUserDetailVO);
@@ -170,4 +193,79 @@
        return eldersAuthService.getAuthHistoryExport(pageEldersAuthElderlyDTO);
    }

    @PostMapping("/auth/task")
    public R timedTaskEldersAuthJobHandler() {
        return eldersAuthService.timedTaskEldersAuthJobHandler();
    }

    /**
     * 检测上月所有视频认证记录，取最后一条记录为认证成功记录
     * @return  执行结果
     */
    @PostMapping("/auth/record/task")
    public R timedTaskEldersRecordAuthJobHandler() {
        return eldersAuthService.timedTaskEldersRecordAuthJobHandler();
    }

    //2021-8-30 身份认证改版（高龄老人认证管理）接口
    /**
     * 分页查询高龄老人认证记录  pageElderAuthRecords  分页查询高龄老人认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/page")
    public R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
        return comElderAuthRecordsService.pageElderAuthRecords(pageElderAuthRecordsDTO);
    }

    /**
     * 根据高龄认证记录id查询详情 detailElderAuthRecords  根据高龄认证记录id查询详情
     * @param    authRecordId   高龄认证记录id
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @GetMapping("/authRecords/detail")
    public R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId) {
        return comElderAuthRecordsService.detailElderAuthRecords(authRecordId);
    }

    /**
     * 高龄认证审核 examineElderAuthRecords  高龄认证审核
     * @param    comElderAuthRecordVO   高龄认证审核参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/examine")
    public R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) {
        return comElderAuthRecordsService.examineElderAuthRecords(comElderAuthRecordVO);
    }

    /**
     * 高龄认证标记 examineElderAuthRecords  高龄认证标记
     * @param    comElderAuthRecordVO   高龄认证标记参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/sign")
    public R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) {
        return comElderAuthRecordsService.signElderAuthRecords(comElderAuthRecordVO);
    }

    /**
     * 根据高龄认证记录id批量查询 getElderAuthRecordsByIds  根据高龄认证记录id批量查询
     * @param    ids   高龄认证记录id集合
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/authRecords/getList")
    public R getElderAuthRecordsByIds(@RequestBody List<Long> ids){
        return comElderAuthRecordsService.getElderAuthRecordsByIds(ids);
    }

}