blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2 
 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java


@@ -1,29 +1,5 @@


package com.moral.api.service.impl;




import com.moral.api.utils.StringUtils;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.codec.digest.DigestUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.client.RestTemplate;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import java.util.ArrayList;


import java.util.Comparator;


import java.util.Date;


import java.util.HashMap;


import java.util.LinkedHashMap;


import java.util.List;


import java.util.Map;


import java.util.Objects;


import java.util.stream.Collectors;




import javax.servlet.http.HttpServletRequest;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


@@ -32,36 +8,27 @@


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.moral.api.entity.Group;


import com.moral.api.entity.Menu;


import com.moral.api.entity.Organization;


import com.moral.api.entity.ResponsibilityUnit;


import com.moral.api.entity.User;


import com.moral.api.entity.UserGroup;


import com.moral.api.entity.UserLog;


import com.moral.api.exception.BusinessException;


import com.moral.api.mapper.MenuMapper;


import com.moral.api.mapper.ResponsibilityUnitMapper;


import com.moral.api.mapper.UserGroupMapper;


import com.moral.api.mapper.UserLogMapper;


import com.moral.api.mapper.UserMapper;


import com.moral.api.entity.*;


import com.moral.api.mapper.*;


import com.moral.api.pojo.bo.UserBO;


import com.moral.api.service.ResponsibilityUnitService;


import com.moral.api.service.UserService;


import com.moral.api.utils.HttpClientUtil;


import com.moral.api.utils.OperationLogUtils;


import com.moral.api.utils.WechatUtils;


import com.moral.constant.Constants;


import com.moral.constant.ResponseCodeEnum;


import com.moral.constant.ResultMessage;


import com.moral.util.AESUtils;


import com.moral.util.ConvertUtils;


import com.moral.util.DateUtils;


import com.moral.util.MD5Utils;


import com.moral.util.RegexUtils;


import com.moral.util.TokenUtils;


import com.moral.util.WebUtils;


import com.sun.org.apache.regexp.internal.RE;


import com.moral.util.*;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.ObjectUtils;


import org.springframework.web.context.request.RequestContextHolder;


import org.springframework.web.context.request.ServletRequestAttributes;




import javax.servlet.http.HttpServletRequest;


import java.util.*;


import java.util.stream.Collectors;




/**


 * <p>


@@ -134,7 +101,7 @@


        userInfo.put("email", userBo.getEmail());


        userInfo.put("mobile", userBo.getMobile());


        userInfo.put("unitId",userBo.getUnitId());


        userInfo.put("unName",responsibilityUnit.getAreaName());


        userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


        userInfo.put("wechat", userBo.getWechat());


        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));


        userInfo.put("isAdmin", userBo.getIsAdmin());


@@ -148,7 +115,7 @@


            result.put("unitId",userBo.getUnitId());


            result.put("userId", userBo.getId());


            result.put("account", userBo.getAccount());


            result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


        } catch (Exception e) {


            log.error("token生成异常：" + e.getMessage());


            result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());


@@ -214,12 +181,11 @@


            //生成token，并存入redis


            String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);


            result.put("token", token);


            result.put("token", token);


            result.put("userName", user.getUserName());


            result.put("unitId",user.getUnitId());


            result.put("userId", user.getId());


            result.put("account", user.getAccount());


            result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


            result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


        } catch (Exception e) {


            log.error("token生成异常：" + e.getMessage());


            result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());


@@ -294,7 +260,7 @@


        userInfo.put("email", userBo.getEmail());


        userInfo.put("mobile", userBo.getMobile());


        userInfo.put("unitId",userBo.getUnitId());


        userInfo.put("unName",responsibilityUnit.getAreaName());


        userInfo.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"未选择责任单位");


        userInfo.put("wechat", userBo.getWechat());


        userInfo.put("expireTime", DateUtils.dateToDateString(userBo.getExpireTime()));


        userInfo.put("isAdmin", userBo.getIsAdmin());