From 28923b3d67c58b032bc4ff128aa1d5e62d73dba1 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 02 Feb 2024 10:07:58 +0800 Subject: [PATCH] fix:提交实时在线率接口 --- screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 480 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 377 insertions(+), 103 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 ca8fb19..cde7c7f 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,52 +1,51 @@ package com.moral.api.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +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.config.Interceptor.UserHelper; +import com.moral.api.entity.*; +import com.moral.api.mapper.*; +import com.moral.api.pojo.bo.UserBO; +import com.moral.api.pojo.enums.AllocationApproveEnum; +import com.moral.api.pojo.enums.FileTableEnum; +import com.moral.api.pojo.enums.StateEnum; +import com.moral.api.pojo.enums.SysDictTypeEnum; + +import com.moral.api.pojo.vo.file.FileVo; +import com.moral.api.pojo.vo.user.QxUser; +import com.moral.api.service.FileTableService; +import com.moral.api.service.ResponsibilityUnitService; +import com.moral.api.service.UserService; +import com.moral.api.utils.OperationLogUtils; +import com.moral.api.utils.StringUtils; +import com.moral.api.utils.WechatUtils; +import com.moral.api.vo.WxMssVo; +import com.moral.constant.Constants; +import com.moral.constant.ResponseCodeEnum; +import com.moral.util.*; + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; +import org.springframework.scheduling.annotation.Async; 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.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -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.User; -import com.moral.api.entity.UserGroup; -import com.moral.api.entity.UserLog; -import com.moral.api.mapper.MenuMapper; -import com.moral.api.mapper.UserGroupMapper; -import com.moral.api.mapper.UserLogMapper; -import com.moral.api.mapper.UserMapper; -import com.moral.api.pojo.bo.UserBO; -import com.moral.api.service.UserService; -import com.moral.api.utils.OperationLogUtils; -import com.moral.constant.Constants; -import com.moral.constant.ResponseCodeEnum; -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 java.util.*; +import java.util.stream.Collectors; /** * <p> @@ -57,6 +56,7 @@ * @since 2021-03-09 */ @Service +@Slf4j public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService { @Autowired @@ -71,13 +71,279 @@ @Autowired private UserLogMapper userLogMapper; + @Autowired + private FileTableService fileTableService; + + @Autowired + private OperationLogUtils operationLogUtils; + + @Autowired + private ResponsibilityUnitMapper responsibilityUnitMapper; + + @Autowired + private ResponsibilityUnitService responsibilityUnitService; + + @Value("${AES.KEY}") private String AESKey; - @Override public UserBO selectUserInfo(Map<String, Object> parameters) { return userMapper.selectUserInfo(parameters); + } + + /** + * ��������������� + * @param parameters + * @return + */ + @Override + @Transactional + public Map<String, Object> loginSmallRoutine(Map<String, Object> parameters) { + UserBO userBo = selectUserInfo(parameters); + String openId = parameters.get("openId").toString(); + Map<String, Object> result = new HashMap<>(); + //������������ + if (userBo == null) { + result.put("code", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode()); + result.put("msg", ResponseCodeEnum.ACCOUNT_NOT_EXIST.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; + } + ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId()); + List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, userBo.getId()); + result.put("userName", userBo.getUserName()); + result.put("unitId",userBo.getUnitId()); + result.put("userId", userBo.getId()); + result.put("account", userBo.getAccount()); + List<FileVo> listFile = fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value); + result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo()); + result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������"); + result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value :StateEnum.TAKE_EFFECT.value); + String userIdStr = new StringBuffer("00").append(userBo.getId().toString()).toString(); + String tokenResult = TokenUtils.getTokenById(userIdStr); + //������������������ + Map<String, Object> userInfo = new LinkedHashMap<>(); + userInfo.put("userId", userBo.getId()); + userInfo.put("account", userBo.getAccount()); + userInfo.put("userName", userBo.getUserName()); + userInfo.put("email", userBo.getEmail()); + userInfo.put("mobile", userBo.getMobile()); + userInfo.put("unitId",userBo.getUnitId()); + 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()); + userInfo.put("organizationId",userBo.getOrganizationId()); + userInfo.put("openid", openId); + if(StringUtils.isNotEmpty(tokenResult)){ + result.put("token", tokenResult); + result.put("code", ResponseCodeEnum.SUCCESS.getCode()); + result.put("msg", ResponseCodeEnum.SUCCESS.getMsg()); + sysLog("������������������" + userBo.getAccount()+" ;openId:"+openId,userBo); + //������openId���user������ + User user = userMapper.selectById(userBo.getId()); + user.setOpenId(openId); + userMapper.updateById(user); + TokenUtils.getRefreshTokenApp(tokenResult,userInfo); + return result; + } + + + try { + //������token������������redis + String token = TokenUtils.getTokenApp(new StringBuffer("00").append(userBo.getId().toString()).toString(),userInfo); + result.put("token", token); + + } 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; + } + sysLog("������������������" + userBo.getAccount()+";openId:"+openId,userBo); + //������openId���user������ + User user = userMapper.selectById(userBo.getId()); + user.setOpenId(openId); + userMapper.updateById(user); + return result; + } + + @Override + public Map<String, Object> wxLogin(String code) { + Map<String, Object> result = new HashMap<>(); + // ������������������������rawData + // ���������signature +// JSONObject rawDataJson = JSON.parseObject(rawData); + // 1.������������������������code + // 2.������������������ ������������������������ appi + appsecret + code + JSONObject SessionKeyOpenId = WechatUtils.getSessionKeyOrOpenId(code); + + // 3.������������������������ ��������������������� + String openid = SessionKeyOpenId.getString("openid"); +// String sessionKey = SessionKeyOpenId.getString("session_key"); + + // 4.������������ ������������������������signature������������������������������signature2 = sha1(rawData + sessionKey) +// String signature2 = DigestUtils.sha1Hex(rawData + sessionKey); +// if (!signature.equals(signature2)) { +// return ResultMessage.ok().message("������������������"); +// return ResultMessage.ok("������������������"); +// throw new BusinessException("������������������"); +// } + // 5.���������������User������������������������������������������������������������������������������������������ + LambdaQueryWrapper<User> lqw = Wrappers.lambdaQuery(); + lqw.eq(User::getOpenId, openid); + User user = userMapper.selectOne(lqw); + if (user == null) { + result.put("code", ResponseCodeEnum.USER_NOT_EXIST.getCode()); + result.put("msg", ResponseCodeEnum.USER_NOT_EXIST.getMsg()); + result.put("openId",openid); + return result; + // ������������������ +// String nickName = rawDataJson.getString("nickName"); +// String avatarUrl = rawDataJson.getString("avatarUrl"); + } + String userIdStr = new StringBuffer("00").append(user.getId().toString()).toString(); + String tokenResult = TokenUtils.getTokenById(userIdStr); + result.put("userName", user.getUserName()); + result.put("unitId",user.getUnitId()); + List<FileVo> listFile = fileTableService.list(user.getId(), FileTableEnum.APP_ALLOCATION.value); + result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo()); + result.put("userId", user.getId()); + result.put("account", user.getAccount()); + ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId()); + List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, user.getId()); + result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value : StateEnum.TAKE_EFFECT.value); + result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������"); + result.put("openId",openid); + Map<String, Object> userInfo = new LinkedHashMap<>(); + userInfo.put("userId", user.getId()); + userInfo.put("account", user.getAccount()); + userInfo.put("userName", user.getUserName()); + userInfo.put("email", user.getEmail()); + userInfo.put("mobile", user.getMobile()); + userInfo.put("unitId",user.getUnitId()); + userInfo.put("organizationId",user.getOrganizationId()); + userInfo.put("wechat", user.getWechat()); + userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime())); + userInfo.put("isAdmin", user.getIsAdmin()); + if(StringUtils.isNotEmpty(tokenResult)){ + result.put("token", tokenResult); + result.put("code", ResponseCodeEnum.SUCCESS.getCode()); + result.put("msg", ResponseCodeEnum.SUCCESS.getMsg()); + sysLog("������������������" + user.getAccount()+" ;openId:"+openid,user); + TokenUtils.getRefreshTokenApp(tokenResult,userInfo); + return result; + } + try { + //������token������������redis + String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo); + result.put("token", token); + + + } 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; + } + 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; + } + + + + /** + * ��������������� + * @param appAllocationPushUserCond + */ + @Override + @Async("asyncPoolTaskExecutor") + public void pushOneUser(Allocation appAllocationPushUserCond) { + QxUser currentUser = UserHelper.getCurrentUser(); + ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(appAllocationPushUserCond.getUnitId()); + Integer areaCode = responsibilityUnit.getAreaCode(); + + List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectAreaUnit(areaCode.toString().length()>6?responsibilityUnit.getParentCode():responsibilityUnit.getAreaCode()); + //������unitid + LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(User::getIsDelete,Constants.NOT_DELETE); + Integer state = appAllocationPushUserCond.getState(); + if (state==20){ + wrapper.eq(User::getUnitId,appAllocationPushUserCond.getUnitId()); + }else { + wrapper.eq(User::getUnitId,ObjectUtils.isEmpty(responsibilityUnits)?0:responsibilityUnits.get(0).getUnitId()); + } + + List<User> users = userMapper.selectList(wrapper); + if (ObjectUtils.isEmpty(users)){ + return; + } + + String dateString = DateUtils.dateToDateString(appAllocationPushUserCond.getEscalationTime(),"MM���dd���"); + //������������������������������������������������access_token������������������������������access_token������������������������������ + //��������������� + String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + WechatUtils.getAccessToken(); + //������������ + for (User user : users) { + if (user.getId().equals(currentUser.getUserId())){ + continue; + } + RestTemplate restTemplate = new RestTemplate(); + //��������������������� + WxMssVo wxMssVo = new WxMssVo(); + wxMssVo.setTouser(user.getOpenId());//���������openid��������������������������������������������������������������������� + wxMssVo.setTemplate_id("YNqUZ1MgMvwY3G-NENVbcmIBR5dUotSdnwcz96CWrho");//������������������id + wxMssVo.setLang("zh_CN"); + wxMssVo.setMiniprogramState("formal"); + wxMssVo.setPage("pages/index/index"); + Map<String, Object> m = new HashMap<>(); + HashMap<String, Object> map1 = new HashMap<>(); + HashMap<String, Object> map2 = new HashMap<>(); + HashMap<String, Object> map3 = new HashMap<>(); + HashMap<String, Object> map4 = new HashMap<>(); + map1.put("value",responsibilityUnit.getUnitName()+dateString+"������������"); + map2.put("value",appAllocationPushUserCond.getAllocationNum()); + map3.put("value",state==30? AllocationApproveEnum.IN_APPROVAL.name:AllocationApproveEnum.UNDER_RECTIFICATION.name); + map4.put("value",DateUtils.dateToDateString(new Date(),"yyyy���MM���dd���")); + m.put("thing18", map1); + m.put("character_string1", map2); + m.put("thing2", map3); + m.put("date4", map4); + wxMssVo.setData(JSON.toJSON(m)); + ResponseEntity<String> responseEntity = + restTemplate.postForEntity(url, wxMssVo, String.class); + String body = responseEntity.getBody(); + log.info("������:"+body+"������:"+user.getAccount()+"openID"+user.getOpenId()); + } + } + + 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 @@ -111,15 +377,18 @@ result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg()); return result; } + //������������������ Map<String, Object> userInfo = new LinkedHashMap<>(); - - //������in��� + ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId()); + //������������ userInfo.put("userId", userBo.getId()); userInfo.put("account", userBo.getAccount()); userInfo.put("userName", userBo.getUserName()); userInfo.put("email", userBo.getEmail()); userInfo.put("mobile", userBo.getMobile()); + userInfo.put("unitId",userBo.getUnitId()); + 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()); @@ -134,14 +403,14 @@ userInfo.put("organization", orgInfo); //��������������� - List<Map<String, Object>> groups = new ArrayList<>(); - for (Group group : userBo.getGroups()) { - HashMap<String, Object> groupMap = new LinkedHashMap<>(); + Group group = userBo.getGroup(); + Map<String, Object> groupMap = new LinkedHashMap<>(); + userInfo.put("group", groupMap); + if (group != null) { groupMap.put("id", group.getId()); groupMap.put("groupName", group.getGroupName()); - groups.add(groupMap); + userInfo.put("group", groupMap); } - userInfo.put("groups", groups); Map<String, Object> map = new HashMap<>(); map.put("userId", userBo.getId()); @@ -150,14 +419,12 @@ try { //������token������������redis String token = TokenUtils.getToken(userBo.getId().toString(), userInfo); - Map<String, Object> data = new HashMap<>(); - data.put("token", token); - data.put("user", userInfo); - result.put("data", data); + result.put("token", token); } 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(); @@ -172,12 +439,19 @@ } @Override + public Map<String, Object> getCurrentUserInfo() { + Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo(); + return userInfo; + } + + @Override public Map<String, Object> getMenus(Map<String, Object> parameters) { List<Menu> allMenus; if (parameters.containsKey("userId")) { allMenus = menuMapper.selectUserMenu(Integer.parseInt(parameters.get("userId").toString())); } else { allMenus = menuMapper.selectOrganizationMenu(Integer.parseInt(parameters.get("orgId").toString())); + allMenus.removeIf(m -> "������������".equals(m.getName())); } Map<String, Object> resultMap = new LinkedHashMap<>(); @@ -192,10 +466,10 @@ oneMenu.forEach(o -> { Map<String, Object> menuMap = new LinkedHashMap<>(); menuMap.put("id", o.getId()); - menuMap.put("name", o.getName()); + menuMap.put("label", o.getName()); menuMap.put("url", o.getUrl()); menuMap.put("icon", o.getIcon()); - menuMap.put("child", getMenusByRecursion(o, allMenus)); + menuMap.put("children", getMenusByRecursion(o, allMenus)); newList.add(menuMap); }); resultMap.put("menus", newList); @@ -209,6 +483,7 @@ //������������������������������ List<Menu> nextLevelMenus = menus.stream() .filter(o -> o.getParentId().equals(menu.getId())) + .sorted(Comparator.comparing(Menu::getOrder)) .collect(Collectors.toList()); List<Map<String, Object>> list = new ArrayList<>(); if (nextLevelMenus.size() > 0) { @@ -216,11 +491,11 @@ nextLevelMenus.forEach(o -> { Map<String, Object> menuMap = new LinkedHashMap<>(); menuMap.put("id", o.getId()); - menuMap.put("name", o.getName()); + menuMap.put("label", o.getName()); menuMap.put("url", o.getUrl()); menuMap.put("icon", o.getIcon()); //��������������� - menuMap.put("child", getMenusByRecursion(o, menus)); + menuMap.put("children", getMenusByRecursion(o, menus)); list.add(menuMap); }); } @@ -230,33 +505,32 @@ @Override @Transactional public Map<String, Object> addUser(User user) { - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - String token = request.getHeader("token"); Map<String, Object> result = new HashMap<>(); - Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token); + Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo(); QueryWrapper<User> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("account", user.getAccount()).eq("is_delete", Constants.NOT_DELETE); //������������������������ - if (user.selectOne(queryWrapper) != null) { + if (user.selectCount(queryWrapper) > 0) { result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode()); result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg()); return result; } - //������������������ + //������������ if (!RegexUtils.checkAccount(user.getAccount())) { result.put("code", ResponseCodeEnum.ACCOUNT_INVALID.getCode()); result.put("msg", ResponseCodeEnum.ACCOUNT_INVALID.getMsg()); return result; } - //������������������ - if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) { + + //������������ + if (!ObjectUtils.isEmpty(user.getEmail()) && !RegexUtils.checkEmail(user.getEmail())) { result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode()); result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg()); return result; } - //������������������ + //������������ String password = user.getPassword(); //������������ password = AESUtils.decrypt(password, AESKey); @@ -265,8 +539,8 @@ result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg()); return result; } - //��������������������� - if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) { + //��������������� + if (!ObjectUtils.isEmpty(user.getMobile()) && !RegexUtils.checkMobile(user.getMobile())) { result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode()); result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg()); return result; @@ -295,57 +569,63 @@ userMapper.insert(user); //������ String content = "������������������" + user.getAccount(); - OperationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE); + operationLogUtils.insertLog(content, Constants.INSERT_OPERATE_TYPE); return result; } @Override @Transactional - public void deleteUser(User user) { - String userId = user.getId().toString(); + public void deleteUser(Integer userId) { + User user = userMapper.selectById(userId); //������������user - user.setIsDelete(Constants.DELETE); - userMapper.updateById(user); + UpdateWrapper<User> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", userId).set("is_delete", Constants.DELETE); + userMapper.update(null, updateWrapper); //������user_group UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>(); deleteWrapper.eq("user_id", userId); userGroupMapper.delete(deleteWrapper); - //������redis - if (TokenUtils.hHasKey(userId)) { - String token = TokenUtils.hget(userId).toString(); - TokenUtils.destoryToken(userId, token); + //������redis + if (TokenUtils.hHasKey(userId.toString())) { + String token = TokenUtils.hget(userId.toString()).toString(); + TokenUtils.destoryToken(userId.toString(), token); } //������ - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); String content = "������������������" + user.getAccount(); - OperationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE); + operationLogUtils.insertLog(content, Constants.DELETE_OPERATE_TYPE); } @Override @Transactional public Map<String, Object> updateUser(User user) { - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - String token = request.getHeader("token"); - + Map<String, Object> result = new HashMap<>(); //��������������� Map<String, Object> update = JSONObject.parseObject(JSON.toJSONString(user), Map.class); - Map<String, Object> result = new HashMap<>(); - Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token); + Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo(); User beforeUser = userMapper.selectById(user.getId()); Map<String, Object> before = JSONObject.parseObject(JSON.toJSONString(beforeUser), Map.class); - String account = beforeUser.getAccount(); + /*String account = beforeUser.getAccount(); //account������������ - user.setAccount(account); + user.setAccount(account);*/ + if (!ObjectUtils.isEmpty(user.getAccount())) { + QueryWrapper<User> queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("account", user.getAccount()); + if (userMapper.selectCount(queryWrapper) > 0) { + result.put("code", ResponseCodeEnum.ACCOUNT_EXIST.getCode()); + result.put("msg", ResponseCodeEnum.ACCOUNT_EXIST.getMsg()); + return result; + } + } //������������ - if (user.getEmail() != null && !RegexUtils.checkEmail(user.getEmail())) { + if (!ObjectUtils.isEmpty(user.getEmail()) && !RegexUtils.checkEmail(user.getEmail())) { result.put("code", ResponseCodeEnum.EMAIL_INVALID.getCode()); result.put("msg", ResponseCodeEnum.EMAIL_INVALID.getMsg()); return result; } //������������ String password = user.getPassword(); - if (password != null) { + if (!ObjectUtils.isEmpty(password)) { //������������ password = AESUtils.decrypt(password, AESKey); if (!RegexUtils.checkPassword(password)) { @@ -356,7 +636,7 @@ } //��������������������� - if (user.getMobile() != null && !RegexUtils.checkMobile(user.getMobile())) { + if (!ObjectUtils.isEmpty(user.getMobile()) && !RegexUtils.checkMobile(user.getMobile())) { result.put("code", ResponseCodeEnum.MOBILE_INVALID.getCode()); result.put("msg", ResponseCodeEnum.MOBILE_INVALID.getMsg()); return result; @@ -373,13 +653,9 @@ Date orgExpireTime = DateUtils.getDate((String) orgInfo.get("expireTime"), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); if (userExpireTime != null) { if (orgExpireTime != null && userExpireTime.getTime() > orgExpireTime.getTime()) { - user.setExpireTime(orgExpireTime); - } else { - user.setExpireTime(userExpireTime); - } - } else { - if (orgExpireTime != null) { - user.setExpireTime(orgExpireTime); + result.put("code", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getCode()); + result.put("msg", ResponseCodeEnum.EXPIRE_BEYOND_ADMIN.getMsg()); + return result; } } //������redis @@ -391,7 +667,8 @@ userMapper.updateById(user); //������ - StringBuilder content = new StringBuilder("������������������" + user.getAccount() + "->"); + String account = userMapper.selectById(userId).getAccount(); + StringBuilder content = new StringBuilder("������������������" + account + "->"); for (String key : update.keySet()) { Object afterValue = update.get(key); if (!key.equals("id") && afterValue != null) { @@ -400,21 +677,18 @@ content.append(key).append(":").append(beforeValue).append("=>").append(afterValue).append(";"); } } - OperationLogUtils.insertLog(request, content.toString(), Constants.UPDATE_OPERATE_TYPE); - + operationLogUtils.insertLog(content.toString(), Constants.UPDATE_OPERATE_TYPE); return result; } @Override public Page<User> selectUsers(Map<String, Object> parameters) { - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - String token = request.getHeader("token"); - - Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token); + Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfo(); Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization"); QueryWrapper<User> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("organization_id", orgInfo.get("id")) - .eq("is_delete", Constants.NOT_DELETE); + .eq("is_delete", Constants.NOT_DELETE) + .eq("is_admin", false); Object order = parameters.get("order"); Object orderType = parameters.get("orderType"); Object account = parameters.get("account"); @@ -439,8 +713,8 @@ queryWrapper.like("wechat", wechat); } - Integer page = (Integer) parameters.get("page"); - Integer size = (Integer) parameters.get("size"); + int page = Integer.parseInt(parameters.get("page").toString()); + int size = Integer.parseInt(parameters.get("size").toString()); Page<User> pageData = new Page<>(page, size); //������������,������create_time������ if (order != null && orderType != null) { -- Gitblit v1.8.0