From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 136 +++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 79 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index b21803f..fc63bce 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -1,28 +1,5 @@
package com.moral.api.service.impl;
-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;
@@ -31,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>
@@ -101,6 +69,11 @@
return userMapper.selectUserInfo(parameters);
}
+ /**
+ * ���������������
+ * @param parameters
+ * @return
+ */
@Override
@Transactional
public Map<String, Object> loginSmallRoutine(Map<String, Object> parameters) {
@@ -113,30 +86,12 @@
result.put("msg", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return result;
}
- //������������
- String password = parameters.get("password").toString();
- //������������
- password = AESUtils.decrypt(password, AESKey);
- if (!MD5Utils.saltMD5Verify(password, userBo.getPassword())) {
- result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
- result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
- return result;
- }
//������������������
if (Constants.DELETE.equals(userBo.getIsDelete())) {
result.put("code", ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
result.put("msg", ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
return result;
}
- //������������������
- if (userBo.getExpireTime() != null && userBo.getExpireTime().getTime() < System.currentTimeMillis()) {
- result.put("code", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getCode());
- result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
- return result;
- }
-// JSONObject SessionKeyOpenId = WechatUtils.getSessionKeyOrOpenId(parameters.get("code").toString());
-// String openid = SessionKeyOpenId.getString("openid");
-// String sessionKey = SessionKeyOpenId.getString("session_key");
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
@@ -146,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());
@@ -154,25 +109,21 @@
try {
//������token������������redis
- String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
+ String token = TokenUtils.getTokenApp(new StringBuffer("00").append(userBo.getId().toString()).toString(),userInfo);
result.put("token", token);
+ result.put("userName", userBo.getUserName());
+ result.put("unitId",userBo.getUnitId());
+ result.put("userId", userBo.getId());
+ result.put("account", userBo.getAccount());
+ 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());
result.put("msg", ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
return result;
}
- //������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- UserLog userLog = new UserLog();
- userLog.setType(Constants.LOGIN_OPERTATE_TYPE);
- userLog.setIp(WebUtils.getIpAddr(request));
- userLog.setOperateId(userBo.getId());
- userLog.setOrganizationId(userBo.getOrganizationId());
- userLog.setContent("������������������" + userBo.getAccount());
- userLogMapper.insert(userLog);
+ sysLog("������������������" + userBo.getAccount()+";openId:"+openId,userBo);
//������openId���user������
-
User user = userMapper.selectById(userBo.getId());
user.setOpenId(openId);
userMapper.updateById(user);
@@ -225,10 +176,16 @@
userInfo.put("wechat", user.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
userInfo.put("isAdmin", user.getIsAdmin());
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
try {
//������token������������redis
- String token = TokenUtils.getToken(user.getId().toString(), userInfo);
+ String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
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)&&Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -237,7 +194,28 @@
}
result.put("code", ResponseCodeEnum.SUCCESS.getCode());
result.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ sysLog("������������������" + user.getAccount()+" ;openId:"+openid,user);
return result;
+ }
+
+ @Override
+ public boolean updateUserId(Integer userId) {
+ User user = userMapper.selectById(userId);
+ user.setOpenId("0");
+ userMapper.updateById(user);
+ sysLog(userId+"������������������",user);
+ return true;
+ }
+ private void sysLog(String cont,User user){
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ UserLog userLog = new UserLog();
+ userLog.setType(Constants.LOGIN_OPERTATE_APP);
+ userLog.setIp(WebUtils.getIpAddr(request));
+ userLog.setOperateId(user.getId());
+ userLog.setOrganizationId(user.getOrganizationId());
+ userLog.setContent(cont);
+ userLogMapper.insert(userLog);
}
@Override
@@ -282,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());
--
Gitblit v1.8.0