huanghongfa
2021-01-29 f3a52628058d098a8b7ed16676bb32b277068f08
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -13,6 +13,7 @@
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
@@ -411,6 +412,10 @@
            });
            loginUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        }
        ComActVO comActVO=userDao.selectCommunity(loginUserInfoVO.getCommunityId());
        if (!ObjectUtils.isEmpty(comActVO)) {
            loginUserInfoVO.setCommunityName(comActVO.getName());
        }
        return R.ok(loginUserInfoVO);
    }
@@ -804,7 +809,7 @@
            e.printStackTrace();
            log.error("编辑后台用户出错【{}】",e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                return R.fail("手机号已经存在");
                return R.fail("此手机号已被占用,请更换其他手机号码");
            }
        }
        if (update>0&&null!=roleDO) {
@@ -1163,10 +1168,15 @@
        List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>();
        List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt));
        if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) {
            List<Integer> typeList=new ArrayList<>(4);
            sysUserNoticeDOS.forEach(sysUserNoticeDO -> {
                SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
                BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
                sysUserNoticeVOList.add(sysUserNoticeVO);
                Integer type = sysUserNoticeDO.getType();
                if (!typeList.contains(type)) {
                    SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
                    BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO);
                    sysUserNoticeVOList.add(sysUserNoticeVO);
                    typeList.add(type);
                }
            });
        }
        noticeUnReadVO.setSysUserNoticeVOList(sysUserNoticeVOList);
@@ -1296,6 +1306,39 @@
        return R.ok(sysUserAgreementVO);
    }
    /**
     * 维护用户最后登录时间
     *
     * @param userId 用户主键
     * @return 维护结果
     */
    @Override
    public R putUserLastLoginTime(Long userId) {
        SysUserDO sysUserDO=new SysUserDO();
        sysUserDO.setUserId(userId);
        sysUserDO.setLastLoginTime(new Date());
        int update = userDao.updateById(sysUserDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }
    /**
     * 删除意见反馈
     *
     * @param id 主键
     * @return 删除结果
     */
    @Override
    public R deleteFeedback(Long id) {
        int delete = sysUserFeedbackDAO.deleteById(id);
        if (delete>0) {
            return R.ok();
        }
        return R.fail();
    }
    public static void main(String[] args) {
        String encode = new BCryptPasswordEncoder().encode("lbsq123456");