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/UserGroupServiceImpl.java | 55 +++++++++++++++++-------------------------------------- 1 files changed, 17 insertions(+), 38 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java index 75a25f0..a4007ee 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java @@ -1,11 +1,7 @@ package com.moral.api.service.impl; -import java.util.ArrayList; -import java.util.List; import java.util.Map; -import java.util.Objects; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.moral.api.entity.UserGroup; import com.moral.api.mapper.GroupMapper; @@ -21,10 +17,6 @@ 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; /** * <p> @@ -52,41 +44,28 @@ @Override @Transactional public void allotGroups(Map<String, Object> parameters) { - HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); - String token = request.getHeader("token"); - + Object o = parameters.get("groupId"); Integer userId = Integer.parseInt(parameters.get("userId").toString()); - List<Integer> groupIds = (ArrayList) parameters.get("groupIds"); - 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"); + UpdateWrapper<UserGroup> deleteWrapper = new UpdateWrapper<>(); deleteWrapper.eq("user_id", userId); userGroupMapper.delete(deleteWrapper); - List<String> groups = new ArrayList<>(); - if (!ObjectUtils.isEmpty(groupIds)) { - groupIds.forEach(groupId -> { - groups.add(groupMapper.selectById(groupId).getGroupName()); - UserGroup userGroup = new UserGroup(); - userGroup.setUserId(userId); - userGroup.setGroupId(groupId); - userGroup.setOrganizationId((Integer) orgInfo.get("id")); - userGroupMapper.insert(userGroup); - }); + + if (!ObjectUtils.isEmpty(o)) { + int groupId = Integer.parseInt(o.toString()); + String groupName = groupMapper.selectById(groupId).getGroupName(); + UserGroup userGroup = new UserGroup(); + userGroup.setUserId(userId); + userGroup.setGroupId(groupId); + userGroup.setOrganizationId((Integer) orgInfo.get("id")); + //user_group���insert + userGroupMapper.insert(userGroup); + //������ + String account = userMapper.selectById((Integer) parameters.get("userId")).getAccount(); + String content = "������������" + account + "���������������" + groupName; + operationLogUtils.insertLog(content, Constants.UPDATE_OPERATE_TYPE); } - - //������ - String account = userMapper.selectById((Integer) parameters.get("userId")).getAccount(); - String content = "������������" + account + "���������������" + groups; - operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE); - } - - @Override - public List<Integer> getGroupIds(Integer userId) { - QueryWrapper<UserGroup> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_id", userId).eq("is_delete", Constants.NOT_DELETE); - List<UserGroup> userGroups = userGroupMapper.selectList(queryWrapper); - List<Integer> groupIds = new ArrayList<>(); - userGroups.forEach(userGroup -> groupIds.add(userGroup.getGroupId())); - return groupIds; } } -- Gitblit v1.8.0