From b8327edbe066671efba657c0f78598400c6d99c0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 10:22:45 +0800
Subject: [PATCH] screen-api 增加设备时维护组织型号关系表
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 94 +++++++++++++++++++++++++++++++---------------
1 files changed, 63 insertions(+), 31 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
index 366b14d..f03442c 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java
@@ -1,32 +1,33 @@
package com.moral.api.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import java.util.HashMap;
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Group;
import com.moral.api.entity.GroupMenu;
-import com.moral.api.entity.User;
import com.moral.api.entity.UserGroup;
import com.moral.api.mapper.GroupMapper;
import com.moral.api.mapper.GroupMenuMapper;
import com.moral.api.mapper.UserGroupMapper;
-import com.moral.api.mapper.UserMapper;
import com.moral.api.service.GroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.utils.OperationLogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
-import com.moral.util.RegexUtils;
+import com.moral.util.ConvertUtils;
import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
/**
* <p>
@@ -48,11 +49,18 @@
@Autowired
private UserGroupMapper userGroupMapper;
+ @Autowired
+ private OperationLogUtils operationLogUtils;
+
@Override
- public Map<String, Object> addGroup(Group group, String token) {
+ public Map<String, Object> addGroup(Group group) {
+ 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);
- Integer orgId = (int) currentUserInfo.get("organizationId");
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("group_name", group.getGroupName())
.eq("organization_id", orgId)
@@ -64,6 +72,10 @@
}
group.setOrganizationId(orgId);
groupMapper.insert(group);
+
+ //������
+ String content = "���������������" + group.getGroupName();
+ operationLogUtils.insertLog(request, content, Constants.INSERT_OPERATE_TYPE);
return result;
}
@@ -72,44 +84,61 @@
//������������group
group.setIsDelete(Constants.DELETE);
groupMapper.updateById(group);
- //������������group_menu
+ //������group_menu
UpdateWrapper<GroupMenu> deleteGroupWrapper = new UpdateWrapper<>();
- deleteGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
- groupMenuMapper.update(null, deleteGroupWrapper);
- //������������user_group
+ deleteGroupWrapper.eq("group_id", group.getId());
+ groupMenuMapper.delete(deleteGroupWrapper);
+ //������user_group
UpdateWrapper<UserGroup> deleteUserGroupWrapper = new UpdateWrapper<>();
- deleteUserGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
- userGroupMapper.update(null, deleteUserGroupWrapper);
+ deleteUserGroupWrapper.eq("group_id", group.getId());
+ userGroupMapper.delete(deleteUserGroupWrapper);
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String content = "���������������" + group.getGroupName();
+ operationLogUtils.insertLog(request, content, Constants.DELETE_OPERATE_TYPE);
}
@Override
- public Map<String, Object> updateGroup(Group group, String token) {
+ public Map<String, Object> updateGroup(Group group) {
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ String token = request.getHeader("token");
+
+ String before = groupMapper.selectById(group.getId()).getGroupName();
Map<String, Object> result = new HashMap<>();
Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
- Object organizationId = currentUserInfo.get("organizationId");
+ Map<String, Object> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
queryWrapper.ne("id", group.getId())
.eq("group_name", group.getGroupName())
.eq("is_delete", Constants.NOT_DELETE)
- .eq("organization_id", organizationId);
+ .eq("organization_id", orgId);
if (groupMapper.selectOne(queryWrapper) != null) {
result.put("code", ResponseCodeEnum.GROUP_EXIST.getCode());
result.put("msg", ResponseCodeEnum.GROUP_EXIST.getMsg());
return result;
}
- group.setOrganizationId((int) organizationId);
+ group.setOrganizationId(orgId);
groupMapper.updateById(group);
+ //������
+ String content = "���������������" + before + "=>" + group.getGroupName();
+ operationLogUtils.insertLog(request, content, Constants.UPDATE_OPERATE_TYPE);
return result;
}
@Override
public Page<Group> selectGroups(Map<String, Object> parameters) {
- Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(parameters.get("token").toString());
- Object organizationId = currentUserInfo.get("organizationId");
+ 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> orgInfo = (Map<String, Object>) currentUserInfo.get("organization");
+ Integer orgId = (Integer) orgInfo.get("id");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("organization_id", organizationId)
+ queryWrapper.eq("organization_id", orgId)
.eq("is_delete", Constants.NOT_DELETE);
Object order = parameters.get("order");
+ Object orderType = parameters.get("orderType");
Object groupName = parameters.get("groupName");
//������������������
if (groupName != null) {
@@ -128,15 +157,18 @@
int size = Integer.parseInt(parameters.get("size").toString());
Page<Group> pageData = new Page<>(page, size);
//������������,������id������
- if (order == null) {
- queryWrapper.orderByAsc("id");
+ //������������,������create_time������
+ if (order != null && orderType != null) {
+ if (Constants.ORDER_ASC.equals(orderType)) {
+ queryWrapper.orderByAsc(ConvertUtils.toLine(order.toString()));
+ } else {
+ queryWrapper.orderByDesc(ConvertUtils.toLine(order.toString()));
+ }
} else {
- queryWrapper.orderByAsc(order.toString(), "id");
+ queryWrapper.orderByDesc("create_time");
}
- Page<Group> groupPage = groupMapper.selectPage(pageData, queryWrapper);
-
- pageData.setRecords(groupPage.getRecords());
- return groupPage;
+ groupMapper.selectPage(pageData, queryWrapper);
+ return pageData;
}
}
--
Gitblit v1.8.0