From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 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..81aef52 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,11 +1,18 @@
package com.moral.api.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.moral.api.entity.ManageAccountRole;
import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
+import com.moral.api.mapper.ManageAccountRoleMapper;
import com.moral.api.mapper.ManageRoleMapper;
import com.moral.api.mapper.ManageRoleMenuMapper;
import com.moral.api.service.ManageRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
@@ -36,16 +43,24 @@
return null;
}
- @Resource
+ @Autowired(required = false)
private ManageRoleMapper manageRoleMapper;
- @Resource
+ @Autowired(required = false)
private ManageRoleMenuMapper manageRoleMenuMapper;
+
+ @Autowired(required = false)
+ private ManageAccountRoleMapper manageAccountRoleMapper;
@Override
@Transactional
- public List<ManageRole> getAll() {
- return manageRoleMapper.getAll();
+ public List<ManageRole> getAllWithPagingQuery(Map map) {
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(Integer.parseInt(map.get("current").toString()), Integer.parseInt(map.get("size").toString()));
+ QueryWrapper<ManageRole> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
+ List<ManageRole> manageRoles = resultpage.getRecords();
+ return manageRoles;
}
@Override
@@ -53,23 +68,22 @@
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","���������������������");
+ resultMap.put("code",ResponseCodeEnum.ROLE_IS_EXPIRE.getCode());
+ resultMap.put("msg",ResponseCodeEnum.ROLE_IS_EXPIRE.getMsg());
}else {
manageRoleMapper.insertOne(manageRole);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
- boolean flag = Boolean.parseBoolean(resultMap.get("flag").toString());
- if (flag){
+ Integer code = Integer.parseInt(resultMap.get("code").toString());
+ if (code.equals(ResponseCodeEnum.SUCCESS.getCode())){
ManageRole manageRoleIns = manageRoleMapper.getManageRoleByName(manageRole.getName());
int role_id = manageRoleIns.getId();
- System.out.println(role_id);
List insertList = new ArrayList();
for (Object temp: list) {
Map<String,Integer> insertMap = new HashMap<>();
@@ -77,7 +91,6 @@
insertMap.put("menu_id",Integer.parseInt(temp.toString()));
insertList.add(insertMap);
}
- System.out.println(insertList);
manageRoleMenuMapper.insertBatch(insertList);
}
return resultMap;
@@ -88,48 +101,59 @@
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 {
manageRoleMapper.updateManageRoleById(map);
- resultMap.put("flag",true);
- resultMap.put("msg","���������������");
+ 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 List<ManageRole> getManageRoleByNameFuzzy(Map map) {
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<ManageRole> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(Integer.parseInt(map.get("current").toString()), Integer.parseInt(map.get("size").toString()));
+ QueryWrapper<ManageRole> wrapper = new QueryWrapper();
+ wrapper.eq("is_delete",0);
+ wrapper.like("name",map.get("name"));
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
+ List<ManageRole> manageRoles = resultpage.getRecords();
+ return manageRoles;
}
@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);
+ resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
}
return resultMap;
}
--
Gitblit v1.8.0