From b3204224f9ba08969dbdf383849ed91a04279156 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Jun 2021 11:38:53 +0800
Subject: [PATCH] screen-manage 修复更新设备的站点不判断组织的bug
---
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 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 8ab1c0d..4515798 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,10 +1,29 @@
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;
import com.moral.api.mapper.UserGroupMapper;
+import com.moral.api.mapper.UserMapper;
import com.moral.api.service.UserGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.utils.OperationLogUtils;
+import com.moral.constant.Constants;
+import com.moral.util.TokenUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -17,4 +36,56 @@
@Service
public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper, UserGroup> implements UserGroupService {
+ @Autowired
+ private UserGroupMapper userGroupMapper;
+
+ @Autowired
+ private UserMapper userMapper;
+
+ @Autowired
+ private GroupMapper groupMapper;
+
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
+ @Override
+ @Transactional
+ public void allotGroups(Map<String, Object> parameters) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
+ 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> 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 (groupIds != null && !groupIds.isEmpty()) {
+ 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);
+ });
+ }
+
+ //������
+ String account = userMapper.selectById((Integer) parameters.get("userId")).getAccount();
+ String content = "������������" + account + "���������������" + groups.toString();
+ 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