From f62ce761a5c2dd1f281acbf72a66fd752af3d75d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 23 Jul 2021 14:19:51 +0800
Subject: [PATCH] 设备状态判断更新
---
screen-api/src/main/java/com/moral/api/service/impl/UserGroupServiceImpl.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 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 66f03ef..bcdc290 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
@@ -5,7 +5,6 @@
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;
@@ -20,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -45,6 +45,9 @@
@Autowired
private GroupMapper groupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
@Transactional
public void allotGroups(Map<String, Object> parameters) {
@@ -59,7 +62,7 @@
deleteWrapper.eq("user_id", userId);
userGroupMapper.delete(deleteWrapper);
List<String> groups = new ArrayList<>();
- if (groupIds != null && !groupIds.isEmpty()) {
+ if (!ObjectUtils.isEmpty(groupIds)) {
groupIds.forEach(groupId -> {
groups.add(groupMapper.selectById(groupId).getGroupName());
UserGroup userGroup = new UserGroup();
@@ -72,17 +75,7 @@
//������
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;
+ String content = "������������" + account + "���������������" + groups;
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
}
}
--
Gitblit v1.8.0