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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,38 +1,44 @@
package com.panzhihua.applets.api;

import javax.annotation.Resource;

import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserAppVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.TencentUtils;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.vos.IPageVO;

import javax.annotation.Resource;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * */
 */
@Slf4j
@RestController
@RequestMapping("/eldersauth")
@@ -46,7 +52,9 @@

    /**
     * 分页查找
     * @param pageEldersAuthDTO 查找高龄认证传递对象
     * 
     * @param pageEldersAuthDTO
     *            查找高龄认证传递对象
     * @return 查找结果
     */
    @PostMapping("/page")
@@ -59,7 +67,9 @@

    /**
     * 查询高龄认证详细信息
     * @param id 高龄认证 id
     * 
     * @param id
     *            高龄认证 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
@@ -68,17 +78,17 @@
        return eldersAuthService.eldersAuthDetails(id);
    }


    @GetMapping("/family")
    @ApiOperation(value = "我的家庭成员@已过期", response = R.class)
    R<IPageVO<ComMngFamilyInfoVO>> family(){
        return eldersAuthService.getMyfamilyElders(getUserId());
    }


    /**
     * 新增高龄认证
     * @param eldersAuthAddByFamilyDTO 添加高龄认证传递对象
     * 
     * @param eldersAuthAddByFamilyDTO
     *            添加高龄认证传递对象
     * @return 新增结果
     */
    @PostMapping("/addByFamily")
@@ -98,7 +108,6 @@
        return eldersAuthService.communityElderAuthType(eldersAuthTypeQueryDTO);
    }


    @PostMapping("/getEidToken")
    @ApiOperation(value = "高龄认证获取EidToken接口")
    public R getEidToken(@RequestParam("authUserId") Long authUserId){
@@ -108,7 +117,8 @@

        R isOk = eldersAuthService.getEldersAuthUserByApp(authUserId);
        if(R.isOk(isOk)){
            ComElderAuthUserDetailVO authUserDetailVO = JSONObject.parseObject(JSONObject.toJSONString(isOk.getData()), ComElderAuthUserDetailVO.class);
            ComElderAuthUserDetailVO authUserDetailVO =
                JSONObject.parseObject(JSONObject.toJSONString(isOk.getData()), ComElderAuthUserDetailVO.class);
            //获取EidToken接口
            String result = TencentUtils.getEidToken(authUserDetailVO.getName(),authUserDetailVO.getIdCard());
            return R.ok(result);
@@ -184,7 +194,9 @@

    /**
     * 分页查找
     * @param pageComEldersRecordsDTO 查找高龄认证记录
     * 
     * @param pageComEldersRecordsDTO
     *            查找高龄认证记录
     * @return 查找结果
     */
    @PostMapping("/records")
@@ -199,7 +211,9 @@

    /**
     * 查询高龄老人库详细信息
     * @param id 高龄老人库 id
     * 
     * @param id
     *            高龄老人库 id
     * @return 查找结果
     */
    @GetMapping("/records/{id}")