代码合并以及问题修复

huanghongfa

2021-06-10 a5255613206a8f9307b825f5ab32c41eb42ef169

代码合并以及问题修复

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

@@ -9,12 +9,12 @@
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthUserVO;
import com.panzhihua.common.model.vos.community.*;
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;
@@ -26,8 +26,6 @@
import com.panzhihua.common.model.vos.IPageVO;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthVO;

/**
 *
@@ -43,6 +41,8 @@

    @Resource
    private CommunityService eldersAuthService;
    @Resource
    private UserService userService;

    /**
     * 分页查找
@@ -182,4 +182,40 @@
        return eldersAuthService.editEldersByApp(authUserAddAppDTO);
    }

    /**
     * 分页查找
     * @param pageComEldersRecordsDTO 查找高龄认证记录
     * @return 查找结果
     */
    @PostMapping("/records")
    @ApiOperation(value = "生存认证记录", response = EldersAuthVO.class)
    R query(@Validated @RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO){
        ClazzUtils.setIfStringIsEmpty(pageComEldersRecordsDTO);
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        pageComEldersRecordsDTO.setOperUserId(loginUserInfoVO.getUserId());
        pageComEldersRecordsDTO.setOperUserName(loginUserInfoVO.getNickName());
        return eldersAuthService.queryEldersRecord(pageComEldersRecordsDTO);
    }

    /**
     * 查询高龄老人库详细信息
     * @param id 高龄老人库 id
     * @return 查找结果
     */
    @GetMapping("/records/{id}")
    @ApiOperation(value = "认证详情详细信息")
    R<ComEldersAuthElderlyDetailsVO> detail(@PathVariable("id") Long id){
        return eldersAuthService.comEldersAuthElderlyDetails(id);
    }

    @GetMapping("/no/tips")
    @ApiOperation(value = "高龄认证不再显示提示")
    public R noTips(){
        LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
        if(loginUserInfoVO == null){
            return R.fail("请先登录");
        }
        return userService.noTips(loginUserInfoVO.getUserId());
    }

}

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

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/common/pom.xml

@@ -14,6 +14,12 @@
    <packaging>jar</packaging>

    <dependencies>

        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-core</artifactId>
            <version>4.0.7</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-context</artifactId>
@@ -130,6 +136,7 @@
            <artifactId>commons-codec</artifactId>
            <version>1.9</version>
        </dependency>

        <dependency>
            <groupId>com.tencentcloudapi</groupId>
            <artifactId>tencentcloud-sdk-java</artifactId>

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -90,7 +90,7 @@
    /**
     * 令牌有效期（分钟）
     */
    public final static long _EXPIRE = 720;
    public final static long TOKEN_EXPIRE = 720;

    /**
     * 参数管理 cache key

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComEldersAuthElderlyExcelListen.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;

import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdcardUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthElderlyDTO.java

@@ -42,9 +42,9 @@
    @ApiModelProperty(value = "人员类别",example = "1:80-89周岁;2:90-99周岁;3:100周岁（含）以上")
    private Integer level;

    @ApiModelProperty(value = "是否健在",example = "1是，0否")
    @ApiModelProperty(value = "是否健在",example = "1是，2否")
    private Integer isExist;

    @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，0否")
    @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，2否")
    private Integer isBigAge;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -174,4 +174,7 @@
    @ApiModelProperty("下班时间")
    private Integer workEndTime;

    @ApiModelProperty("高龄认证显示提示（1.是 2.否）")
    private Integer bigAgeTips;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComEldersAuthElderlyDetailsVO.java

@@ -5,8 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;
import java.util.*;


/**
 *
@@ -66,6 +66,9 @@
    @ApiModelProperty(value = "管辖社区")
    private String communityName;

    @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
    private Integer type;

    @ApiModelProperty(value = "反馈信息")
    private List<EldersAuthFeedbackVO> feedback;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthVO.java

@@ -68,4 +68,10 @@
    @ApiModelProperty(value = "家庭成员ID")
    private Long  familyUserId;

    @ApiModelProperty(value = "核验类型（1.视频认证 2.人脸核验）")
    private Integer type;

    @ApiModelProperty(value = "人脸核验结果数据")
    private Integer verificationResult;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -757,4 +757,7 @@
     */
    @PostMapping("gridMemberEditStatus")
    R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);

    @GetMapping("big/no/tip")
    R noTips(@RequestParam("userId") Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/TencentUtils.java

@@ -1,9 +1,9 @@
package com.panzhihua.common.utlis;

import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.common.profile.ClientProfile;
import com.tencentcloudapi.common.profile.HttpProfile;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;
import com.tencentcloudapi.faceid.v20180301.FaceidClient;
import com.tencentcloudapi.faceid.v20180301.models.*;
import lombok.extern.slf4j.Slf4j;

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java

@@ -303,6 +303,7 @@
        return communityService.listBuildType();
    }


    @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class)
    @PostMapping("pageotherbuild")
    public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){
@@ -446,6 +447,7 @@
        return communityService.deleteVolunteerExamine(comMngVolunteerMngVO);
    }


    @ApiOperation(value = "导入居民")
    @PostMapping("importuser")
    public R importUser(MultipartFile multipartFile)throws IOException {
@@ -462,6 +464,9 @@
        EasyExcel.read(multipartFile.getInputStream(), EexcelUserDTO.class, new UploadEexcelUserDTOListener(userService,name)) .extraRead(CellExtraTypeEnum.MERGE).headRowNumber(1).sheet().doRead();
        return R.ok();
    }




    @ApiOperation(value = "社区人员详情",response = CommunityUserInfoVO.class)
    @GetMapping("detailuser")
@@ -575,6 +580,7 @@
        }
    }


    @ApiOperation(value = "选择导入的小区",response =ComMngStructAreaVO.class )
    @GetMapping("listareas")
    public R listAreas(String param) {

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.api;

import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -82,6 +83,8 @@
    private EldersAuthService eldersAuthService;
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
    public ComEldersAuthUserService comEldersAuthUserService;

    /**
     * 新增社区活动
@@ -1576,29 +1579,23 @@
    @PostMapping("/eldersauth/addByFamilyUser")
    R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){

        List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
        ComMngFamilyInfoVO theFamily = null;
        Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
        for (ComMngFamilyInfoVO family : list) {
            if (familyUserId == family.getId()) {
                theFamily = family;
            }
        ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
        if(authUserDO == null){
            return R.fail("未查询到老人信息");
        }

        if(theFamily==null){
            return R.fail("家庭成员信息错误");
        }
        Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
        Integer age = IdcardUtil.getAgeByIdCard(authUserDO.getIdCard());
        if(age>=80){
            Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
            EldersAuthDO eldersAuthDO = new EldersAuthDO();
            eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
            eldersAuthDO.setSumitUserId(loginUserId);
            eldersAuthDO.setCreateBy(loginUserId);
            eldersAuthDO.setCreateAt(new Date());
            eldersAuthDO.setIdCard(theFamily.getIdCard());
            eldersAuthDO.setAuthUserName(theFamily.getName());
            eldersAuthDO.setIdCard(authUserDO.getIdCard());
            eldersAuthDO.setAuthUserName(authUserDO.getName());
            eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
            eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
            eldersAuthDO.setFamilyUserId(authUserDO.getId());
            eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
            //根据身份证查询出籍贯 出生日期
            //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
            String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -35,7 +35,7 @@
    private String happenAddr;

    /**
     * 状态 1待处理 2已处理
     * 状态 1待审核   2进行中 3已驳回 4已完成
     */
    private Integer status;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/SysConfDO.java

@@ -41,7 +41,7 @@
    /**
     * 参数描述   列: describe
     */
    @TableField("'describe'")
    @TableField("`describe`")
    private String describe;
    /**
     * 创建时间   列: create_at

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/EldersAuthService.java

@@ -125,5 +125,5 @@
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    R<SysConfVO> communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
    R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
}

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -175,6 +176,9 @@
    @Override
    public R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(Long id) {
        EldersAuthDO eldersAuthDO = eldersAuthDAO.selectById(id);
        if(eldersAuthDO == null){
            return R.fail("未查询到认证记录");
        }
        ComEldersAuthElderlyDetailsVO comEldersAuthElderlyDetailsVO = new ComEldersAuthElderlyDetailsVO();
        BeanUtils.copyProperties(eldersAuthDO, comEldersAuthElderlyDetailsVO);

@@ -193,11 +197,11 @@
    }

    @Override
    public R<SysConfVO> communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
    public R communityAuthType(EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
        Long communityId = eldersAuthTypeQueryDTO.getCommunityId();
        List<SysConfDO> confDOList =
                sysConfDao.selectList(new LambdaQueryWrapper<SysConfDO>().eq(SysConfDO::getCommunityId, communityId)
                        .orderByDesc(SysConfDO::getCreateAt));
                .orderByDesc(SysConfDO::getCreateAt));
        if(confDOList==null || confDOList.size()==0){
            SysConfDO sysConfDO = new SysConfDO();
            sysConfDO.setCode("ELDER_AUTH_TYPE");
@@ -218,7 +222,7 @@
            SysConfDO  latest = confDOList.get(0);
            SysConfVO sysConfVO = new SysConfVO();
            BeanUtils.copyProperties(latest, sysConfVO);
            return R.ok(sysConfVO);
            return R.ok(sysConfVO.getValue());
        }
        return R.ok();
    }
@@ -239,9 +243,14 @@
            eldersAuthDO.setCreateBy(authGetResultDTO.getUserId());
            eldersAuthDO.setCreateAt(new Date());
            eldersAuthDO.setSumitUserId(authGetResultDTO.getUserId());
            eldersAuthDO.setDomicile(this.baseMapper.selectDomicile(authUserDO.getIdCard()));
            String domicile = this.baseMapper.selectDomicile(eldersAuthDO.getIdCard());
            if(org.springframework.util.StringUtils.isEmpty(domicile)){
                domicile = "暂无";
            }
            eldersAuthDO.setDomicile(domicile);
            eldersAuthDO.setBirthDay(IdCard.birthDay(authUserDO.getIdCard()));
            eldersAuthDO.setFamilyUserId(authUserDO.getId());
            eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(eldersAuthDO.getIdCard()));
            eldersAuthDO.setType(2);
            eldersAuthDO.setVerificationResult(authGetResultDTO.getVerificationResult());

@@ -250,7 +259,7 @@
            authUserDO.setIsAuth(ComEldersAuthUserDO.isAuth.yes);
            comEldersAuthUserMapper.updateById(authUserDO);

            return R.ok();
            return R.ok(eldersAuthDO.getId());
        }
        log.error("人脸核验新增认证记录失败，错误原因：未查询到老人记录，老人id：" + authGetResultDTO.getAuthUserId());
        return R.fail();
@@ -266,19 +275,23 @@
        //判断当前用户是否是高龄老人，如果是则将这个人新增到高龄老人的列表里
        SysUserVO userVO = this.eldersAuthDAO.getSysUserByUserId(authPageDTO.getUserId());
        if(userVO != null){
            //查询老人库是否存在当前用户信息
            ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
                    .eq(ComEldersAuthElderlyDO::getIdCard,userVO.getIdCard()));

            if(authElderlyDO != null){
                ComEldersAuthUserDO authUserDO = new ComEldersAuthUserDO();
                authUserDO.setUserId(userVO.getUserId());
                authUserDO.setRelation(ComEldersAuthUserDO.relation.br);
                authUserDO.setName(userVO.getName());
                authUserDO.setIdCard(userVO.getIdCard());
                authUserDO.setCommunityId(authElderlyDO.getCommunityId());
                authUserDO.setBigAgeId(authElderlyDO.getId());
                comEldersAuthUserMapper.insert(authUserDO);
            //查询当前用户是否已存在用户关联中
            ComEldersAuthUserDO oldAuthUserDO = comEldersAuthUserMapper.selectOne(new QueryWrapper<ComEldersAuthUserDO>().lambda()
                    .eq(ComEldersAuthUserDO::getIdCard,userVO.getIdCard()));
            if(oldAuthUserDO == null){
                //查询老人库是否存在当前用户信息
                ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyMapper.selectOne(new QueryWrapper<ComEldersAuthElderlyDO>().lambda()
                        .eq(ComEldersAuthElderlyDO::getIdCard,userVO.getIdCard()));
                if(authElderlyDO != null){
                    ComEldersAuthUserDO authUserDO = new ComEldersAuthUserDO();
                    authUserDO.setUserId(userVO.getUserId());
                    authUserDO.setRelation(ComEldersAuthUserDO.relation.br);
                    authUserDO.setName(userVO.getName());
                    authUserDO.setIdCard(userVO.getIdCard());
                    authUserDO.setCommunityId(authElderlyDO.getCommunityId());
                    authUserDO.setBigAgeId(authElderlyDO.getId());
                    comEldersAuthUserMapper.insert(authUserDO);
                }
            }
        }

@@ -331,7 +344,7 @@
        authUserDO.setBigAgeId(authElderlyDO.getId());
        authUserDO.setName(authElderlyDO.getName());
        if(comEldersAuthUserMapper.insert(authUserDO) > 0){
            return R.ok();
            return R.ok(authUserDO.getId());
        }

        return R.fail("添加失败");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/SysConfMapper.xml

@@ -9,7 +9,7 @@
        <result property="name" column="name"/>
        <result property="code" column="code"/>
        <result property="value" column="value"/>
        <result property="describe" column="`describe`"/>
        <result property="describe" column="describe"/>
        <result property="createAt" column="create_at"/>
        <result property="createBy" column="create_by"/>
        <result property="communityId" column="community_id"/>
@@ -17,7 +17,7 @@

    <sql id="columns">
    <![CDATA[
        id,name,code,value,describe,create_at,create_by,community_id
        id,name,code,value,`describe`,create_at,create_by,community_id
    ]]>
    </sql>

@@ -40,7 +40,7 @@
                AND value = #{pageSysConfDTO.value}
            </if>
           <if test="pageSysConfDTO.describe!=null">
                AND describe = #{pageSysConfDTO.describe}
                AND `describe` = #{pageSysConfDTO.describe}
            </if>
           <if test="pageSysConfDTO.createAtBegin!=null">
                AND create_at &gt;= #{pageSysConfDTO.createAtBegin}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/test/java/com/panzhihua/service_grid/dao/ApplicationAppReleaseMapperTest.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/GridMemberApi.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -963,5 +963,10 @@
        return userService.gridMemberEditStatus(gridMemberEditDTO);
    }

    @GetMapping("big/no/tip")
    public R noTips(@RequestParam("userId") Long userId){
        return userService.noTips(userId);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java

@@ -191,5 +191,9 @@
     * 网格员上班结束时间
     */
    private Integer workEndTime;
    /**
     * 高龄认证显示提示（1.是 2.否）
     */
    private Integer bigAgeTips;

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -458,4 +458,6 @@
    R deleteMembers(List<Long> Ids);

    R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);

    R noTips(Long userId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -2037,4 +2037,15 @@
        userDao.gridMemberEditStatus(gridMemberEditDTO);
        return R.ok();
    }

    public R noTips(Long userId){
        SysUserDO userDO = this.userDao.selectById(userId);
        if(userDO != null){
            userDO.setBigAgeTips(2);
            if(this.userDao.updateById(userDO) > 0){
                return R.ok();
            }
        }
        return R.fail();
    }
}