我的模块

huanghongfa

2020-12-23 28acd0445560179dd4187a9bd834650ca3500bba

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

File was renamed from springcloud_k8s_panzhihuazhihuishequ/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.constants.SecurityConstants;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -27,6 +28,7 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.*;
@@ -421,6 +423,9 @@
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            //删除用户信息缓存
            String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
            stringRedisTemplate.delete(userKey);
            return R.ok();
        }
        return R.fail();
@@ -443,6 +448,10 @@
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
        sysUserDO.setFaceState(0);
        SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, loginUserInfoVO.getIdCard()));
        if (!ObjectUtils.isEmpty(sysUserDO1)) {
            return R.fail("身份证已经存在");
        }
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
@@ -471,7 +480,7 @@
        }
        SysUserDO sysUserDO1 = userDao.selectById(userPhoneVO.getUserId());
        String phone = sysUserDO1.getPhone();
        if (!phone.equals(oldPhone)) {
        if (!StringUtils.isEmpty(phone)&& !phone.equals(oldPhone)) {
            return R.fail("旧手机号错误");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
@@ -497,6 +506,38 @@
     */
    @Override
    public R putUser(LoginUserInfoVO loginUserInfoVO) {
        Integer faceState = loginUserInfoVO.getFaceState();
        if (null==faceState||0==faceState) {
            loginUserInfoVO.setFaceState(null);
        }
        Integer isPartymember = loginUserInfoVO.getIsPartymember();
        if (null==isPartymember||0==isPartymember) {
            loginUserInfoVO.setIsPartymember(null);
        }
        Integer isVolunteer = loginUserInfoVO.getIsVolunteer();
        if (null==isVolunteer||0==isVolunteer) {
            loginUserInfoVO.setIsVolunteer(null);
        }
        Integer operationType = loginUserInfoVO.getOperationType();
        if (null==operationType||0==operationType) {
            loginUserInfoVO.setOperationType(null);
        }
        Integer sex = loginUserInfoVO.getSex();
        if (null==sex||0==sex) {
            loginUserInfoVO.setSex(null);
        }
        Integer status = loginUserInfoVO.getStatus();
        if (null==status||0==status) {
            loginUserInfoVO.setStatus(null);
        }
        Integer type = loginUserInfoVO.getType();
        if (null==type||0==type) {
            loginUserInfoVO.setType(null);
        }
        Long communityId = loginUserInfoVO.getCommunityId();
        if (null==communityId||0==communityId) {
            loginUserInfoVO.setCommunityId(null);
        }
        SysUserDO sysUserDO=new SysUserDO();
        BeanUtils.copyProperties(loginUserInfoVO,sysUserDO);
        int update = userDao.updateById(sysUserDO);
@@ -536,6 +577,10 @@
    public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
        ComMngFamilyInfoDO comMngFamilyInfoDO1 = comMngFamilyInfoDAO.selectOne(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getIdCard, comMngFamilyInfoVO.getIdCard()).eq(ComMngFamilyInfoDO::getUserId, comMngFamilyInfoVO.getUserId()));
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
            return R.fail("家庭成员已经存在");
        }
        int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
        if (insert>0) {
            return R.ok();
@@ -552,7 +597,7 @@
    @Override
    public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
        BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
        int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
        if (update>0) {
            return R.ok();