From a52b9c0e0f708b36d35dbc95c591645d249d7db7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Jun 2021 17:27:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 212 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 167 insertions(+), 45 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 3552237..72b79bc 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -1,20 +1,27 @@
package com.moral.api.service.impl;
-import com.moral.api.entity.ManageMenu;
-import com.moral.api.entity.ManageRole;
-import com.moral.api.mapper.ManageRoleMapper;
-import com.moral.api.mapper.ManageRoleMenuMapper;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.*;
+import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.service.ManageRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.LogUtils;
+import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* <p>
@@ -36,50 +43,96 @@
return null;
}
- @Resource
+ @Autowired(required = false)
private ManageRoleMapper manageRoleMapper;
- @Resource
+ @Autowired(required = false)
+ private ManageMenuMapper manageMenuMapper;
+
+ @Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
+ @Autowired(required = false)
+ private ManageAccountRoleMapper manageAccountRoleMapper;
+
+ @Autowired
+ LogUtils logUtils;
+
@Override
- @Transactional
- public List<ManageRole> getAll() {
- return manageRoleMapper.getAll();
+ public Map<String,Object> getAllWithPagingQuery(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
+ QueryWrapper<ManageRole> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ wrapper.orderByDesc("create_time");
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
+ List<ManageRole> manageRoles = resultpage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> manageRolesList = new ArrayList<>();
+ for (ManageRole manageRole:manageRoles) {
+ Map manageRoleMap = JSON.parseObject(JSON.toJSONString(manageRole),Map.class);
+ String createTime = SDF.format(manageRole.getCreateTime());
+ String updateTime = SDF.format(manageRole.getUpdateTime());
+ manageRoleMap.put("createTime",createTime);
+ manageRoleMap.put("updateTime",updateTime);
+ manageRoleMap.put("key",manageRole.getId());
+ manageRolesList.add(manageRoleMap);
+ }
+ resultMap.put("manageRoles",manageRolesList);
+ int totalNumber = manageRoleMapper.selectCount(wrapper);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
}
@Override
@Transactional
- public Map<String,Object> insertOne(ManageRole manageRole,List list) {
+ public Map<String,Object> insertOne(ManageRole manageRole, List list) {
Map<String,Object> resultMap = new HashMap<>();
if (manageRole.getName()==null){
- resultMap.put("flag",false);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
if (manageRoleMapper.getManageRoleByName(manageRole.getName()) != null){
- resultMap.put("flag",false);
- resultMap.put("msg","���������������������");
- }else {
- manageRoleMapper.insertOne(manageRole);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXIST.getMsg());
+ return resultMap;
}
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
- ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
- int role_id = manageRoleIns.getId();
- System.out.println(role_id);
+ manageRoleMapper.insertOne(manageRole);
+ ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
+ int role_id = manageRoleIns.getId();
+ if (list.size()>0){
+ //���������������
+ List supplementList = new ArrayList();
+ supplementList.addAll(list);
+ for (int i=0;i<supplementList.size();i++) {
+ supplementList.addAll(supplementParentMenus(Integer.parseInt(supplementList.get(i).toString())));
+ }
+ LinkedHashSet<Object> hashSet = new LinkedHashSet<>(supplementList);
+ ArrayList<Object> menuList = new ArrayList<>(hashSet);
List insertList = new ArrayList();
- for (Object temp: list) {
+ for (Object temp: menuList) {
Map<String,Integer> insertMap = new HashMap<>();
insertMap.put("role_id",role_id);
insertMap.put("menu_id",Integer.parseInt(temp.toString()));
insertList.add(insertMap);
}
- System.out.println(insertList);
manageRoleMenuMapper.insertBatch(insertList);
}
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "������������:"+manageRole.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
return resultMap;
}
@@ -88,49 +141,118 @@
public Map<String,Object> updateManageRole(Map map) {
Map<String,Object> resultMap = new HashMap<>();
if (!map.containsKey("id")){
- resultMap.put("flag",false);
- resultMap.put("msg","������������������������");
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
if (manageRoleMapper.getManageRoleById(Integer.parseInt(map.get("id").toString())) == null){
- resultMap.put("flag",false);
- resultMap.put("msg","���������������������");
+ resultMap.put("code",ResponseCodeEnum.ROLE_IS_NULL.getCode());
+ resultMap.put("msg",ResponseCodeEnum.ROLE_IS_NULL.getMsg());
}else {
+ //���������������������������������
+ ManageRole manageRoleOld = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
manageRoleMapper.updateManageRoleById(map);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ String content = "���������������:"+manageRoleOld.getName()+";";
+ for (Object key:map.keySet()) {
+ if (key.toString().equals("name")&&map.get(key)!=null){
+ content = content+"���������:"+manageRoleOld.getName()+"->"+map.get(key)+";";
+ }
+ if (key.toString().equals("desc")&&map.get(key)!=null){
+ content = content+"������:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
+ }
+ }
+ logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
@Override
- @Transactional
- public List<ManageRole> getManageRoleByNameFuzzy(ManageRole manageRole) {
- return manageRoleMapper.getManageRoleByNameFuzzy(manageRole);
+ public Map<String,Object> getManageRoleByNameFuzzy(Map map) {
+ Map<String,Object> resultMap = new HashMap<>();
+ int current = Integer.parseInt(map.get("current").toString());
+ int size = Integer.parseInt(map.get("size").toString());
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
+ QueryWrapper<ManageRole> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ wrapper.like("name",map.get("name"));
+ wrapper.orderByDesc("create_time");
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
+ List<ManageRole> manageRoles = resultpage.getRecords();
+ SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<Map<String,Object>> manageRolesList = new ArrayList<>();
+ for (ManageRole manageRole:manageRoles) {
+ Map manageRoleMap = JSON.parseObject(JSON.toJSONString(manageRole),Map.class);
+ String createTime = SDF.format(manageRole.getCreateTime());
+ String updateTime = SDF.format(manageRole.getUpdateTime());
+ manageRoleMap.put("createTime",createTime);
+ manageRoleMap.put("updateTime",updateTime);
+ manageRolesList.add(manageRoleMap);
+ }
+ resultMap.put("manageRoles",manageRolesList);
+ int totalNumber = manageRoleMapper.selectCount(wrapper);
+ resultMap.put("totalNumber",totalNumber);
+ resultMap.put("current",current);
+ int totalPageNumber = totalNumber/size;
+ if(totalNumber%size != 0){
+ totalPageNumber += 1;
+ }
+ resultMap.put("totalPageNumber",totalPageNumber);
+ return resultMap;
}
@Override
public Map<String, Object> deleteManageRole(Map map) {
Map<String,Object> resultMap = new HashMap<>();
if (!map.containsKey("id")){
- resultMap.put("flag",false);
- resultMap.put("msg","������������������������");
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
return resultMap;
}
if (manageRoleMapper.getManageRoleById(Integer.parseInt(map.get("id").toString())) == null){
- resultMap.put("flag",false);
- resultMap.put("msg","������������������������������������");
+ resultMap.put("code",ResponseCodeEnum.ROLE_IS_NULL.getCode());
+ resultMap.put("msg",ResponseCodeEnum.ROLE_IS_NULL.getMsg());
}else {
ManageRole manageRole = new ManageRole();
manageRole.setId(Integer.parseInt(map.get("id").toString()));
- manageRole.setIsDelete("1");
+ manageRole.setIsDelete(Constants.DELETE);
Map deleteMap = new HashMap();
deleteMap.put("id",Integer.parseInt(map.get("id").toString()));
deleteMap.put("is_delete",1);
manageRoleMapper.updateManageRoleById(deleteMap);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ ManageAccountRole manageAccountRole = new ManageAccountRole();
+ manageAccountRole.setIsDelete("1");
+ QueryWrapper<ManageAccountRole> wrapper = new QueryWrapper();
+ wrapper.eq("role_id",Integer.parseInt(map.get("id").toString()));
+ manageAccountRoleMapper.update(manageAccountRole,wrapper);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ ManageRole manageRole1 = manageRoleMapper.selectById(Integer.parseInt(map.get("id").toString()));
+ String content = "������������:"+manageRole1.getName()+";";
+ logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
+
+ /**
+ * @Description: ���������������
+ * @Param: [list, menuId]list���menuId������
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/4/28
+ */
+ private List supplementParentMenus(int menuId) {
+ List list = new ArrayList();
+ ManageMenu manageMenu = manageMenuMapper.getManageMenuById(menuId);
+ if (manageMenu.getParentId()!=0){
+ list.add(manageMenu.getParentId());
+ list.addAll(supplementParentMenus(manageMenu.getParentId()));
+ }
+ return list;
+ }
}
--
Gitblit v1.8.0