From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的方法 更新WebUtils工具类，添加获取请求Ip方法 manage模块： 组织和后台用户增删改查模块全部完成 增加aop用作日志插入
---
screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 20 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 59f014e..ce249a6 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,15 +1,29 @@
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 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.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.RegexUtils;
+import com.moral.util.TokenUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,29 +43,98 @@
private GroupMapper groupMapper;
@Autowired
- private UserMapper userMapper;
+ private GroupMenuMapper groupMenuMapper;
+
+ @Autowired
+ private UserGroupMapper userGroupMapper;
@Override
- public Map<String, Object> addGroup(Group group, String currentUserId) {
- Map<String, Object> resultMap = new HashMap<>();
- User currentUser = userMapper.selectById(currentUserId);
- if (!currentUser.getIsAdmin()) {
- resultMap.put("flag", false);
- resultMap.put("msg", "���������������������������");
- return resultMap;
- }
- Integer orgId = currentUser.getOrganizationId();
+ public Map<String, Object> addGroup(Group group, String token) {
+ Map<String, Object> result = new HashMap<>();
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Integer orgId = (int) currentUserInfo.get("organizationId");
QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("group_name", group.getGroupName()).eq("organization_id", orgId);
- if (groupMapper.selectOne(queryWrapper) == null) {
- group.setOrganizationId(orgId);
- groupMapper.insert(group);
- resultMap.put("flag", true);
- resultMap.put("msg", "������������");
- } else {
- resultMap.put("flag", false);
- resultMap.put("msg", "���������������������������");
+ queryWrapper.eq("group_name", group.getGroupName())
+ .eq("organization_id", orgId)
+ .eq("is_delete", Constants.NOT_DELETE);
+ if (groupMapper.selectOne(queryWrapper) != null) {
+ result.put("code", ResponseCodeEnum.GROUP_EXIST.getCode());
+ result.put("msg", ResponseCodeEnum.GROUP_EXIST.getMsg());
+ return result;
}
- return resultMap;
+ group.setOrganizationId(orgId);
+ groupMapper.insert(group);
+ return result;
}
+
+ @Override
+ public void deleteGroup(Group group) {
+ //������������group
+ group.setIsDelete(Constants.DELETE);
+ groupMapper.updateById(group);
+ //������������group_menu
+ UpdateWrapper<GroupMenu> deleteGroupWrapper = new UpdateWrapper<>();
+ deleteGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
+ groupMenuMapper.update(null, deleteGroupWrapper);
+ //������������user_group
+ UpdateWrapper<UserGroup> deleteUserGroupWrapper = new UpdateWrapper<>();
+ deleteUserGroupWrapper.set("is_delete", Constants.DELETE).eq("group_id", group.getId());
+ userGroupMapper.update(null, deleteUserGroupWrapper);
+ }
+
+ @Override
+ public Map<String, Object> updateGroup(Group group, String token) {
+ Map<String, Object> result = new HashMap<>();
+ Map<String, Object> currentUserInfo = (Map<String, Object>) TokenUtils.getUserInfoByToken(token);
+ Object organizationId = currentUserInfo.get("organizationId");
+ 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);
+ 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);
+ groupMapper.updateById(group);
+ 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");
+ QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("organization_id", organizationId)
+ .eq("is_delete", Constants.NOT_DELETE);
+ Object order = parameters.get("order");
+ Object groupName = parameters.get("groupName");
+ //������������������
+ if (groupName != null) {
+ queryWrapper.like("group_name", groupName);
+ }
+
+ //������������
+ if (!parameters.containsKey("page")) {
+ parameters.put("page", 0);
+ }
+ if (!parameters.containsKey("size")) {
+ parameters.put("size", 10);
+ }
+
+ int page = Integer.parseInt(parameters.get("page").toString());
+ int size = Integer.parseInt(parameters.get("size").toString());
+ Page<Group> pageData = new Page<>(page, size);
+ //������������,������id������
+ if (order == null) {
+ queryWrapper.orderByAsc("id");
+ } else {
+ queryWrapper.orderByAsc(order.toString(), "id");
+ }
+ groupMapper.selectPage(pageData, queryWrapper);
+ return pageData;
+ }
+
}
--
Gitblit v1.8.0