From b64d778d7ea64b2c6517b4ec34646be50a930151 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 02 六月 2022 12:41:30 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 258ac6a..8425352 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.enums.RoleLevelStatus;
@@ -16,11 +15,14 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.bo.MenuNode;
-import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.domain.Admin;
+import com.sandu.ximon.dao.domain.AdminRoleRelation;
+import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.dao.domain.RoleMenuRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.AdminMapper;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,7 +83,7 @@
/**
* 娣诲姞绠＄悊鍛樻棩蹇楄褰曞紑濮�
*/
- String content = "鏂版敞鍐岀敤鎴凤細" + param.getUsername();
+ String content = "鏂版敞鍐岀鐞嗗憳锛�" + param.getUsername();
StoreOperationRecordsUtils.storeOperationData(null, null, "娣诲姞绠＄悊鍛�", content);
/**
* 娣诲姞绠＄悊鍛樻棩蹇楄褰曠粨鏉�
@@ -164,23 +166,50 @@
return updateById(admin);
}
+ @Transactional(rollbackFor = Exception.class)
public boolean deleteAdmin(Long adminId) {
+ boolean flag = false;
Admin admin = getById(adminId);
if (admin == null) {
throw new BusinessException("鎵句笉鍒扮鐞嗗憳");
}
- List<Role> roles = roleService.listByAdminId(admin.getId());
- if (CollectionUtil.isEmpty(roles)) {
- throw new BusinessException("褰撳墠鐢ㄦ埛娌℃湁瑙掕壊");
- }
- List<Integer> levels = roles.stream().map(Role::getLevel).collect(Collectors.toList());
- int min = Collections.min(levels);
- int maxLevel = roleService.assertLevels(min);
- if (!RoleLevelStatus.SUPER.getCode().equals(maxLevel)) {
+ if (!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
throw new BusinessException("鍙湁瓒呯骇绠＄悊鍛樻墠鑳藉垹闄ょ敤鎴�");
}
- return removeById(adminId);
+ //绠＄悊鍛樿鑹插叧绯昏〃
+ AdminRoleRelationService adminRoleRelationService = SpringContextHolder.getBean(AdminRoleRelationService.class);
+ //鏈夌敤鎴峰繀瀹氭湁鐢ㄦ埛涓庤鑹茬殑鍏崇郴鏁版嵁
+ AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, admin.getId()));
+ Role role = SpringContextHolder.getBean(RoleService.class).getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getId, one.getRoleId()));
+ if (role == null) {
+ throw new BusinessException("鏁版嵁寮傚父锛�");
+ }
+
+ if (role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ throw new BusinessException("瓒呯骇绠＄悊鍛樻棤娉曞垹闄�");
+ } else {
+ //鍒犵敤鎴�
+ if (removeById(adminId)) {
+ //鍒犺鑹插叧绯昏〃淇℃伅
+ flag = adminRoleRelationService.removeById(one);
+ //鍒犻櫎澶辫触鍥炴粴鏁版嵁
+ if (!flag) {
+ throw new BusinessException("鍒犻櫎绠＄悊鍛樼敤鎴峰け璐ワ紒");
+ }
+ }
+ }
+
+ /**
+ * 鍒犻櫎绠＄悊鍛� 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "鍒犻櫎绠＄悊鍛橈細" + admin.getUsername() + "鐢ㄦ埛id锛�" + admin;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鍒犻櫎绠＄悊鍛�", content);
+ /**
+ * 鍒犻櫎绠＄悊鍛� 鏃ュ織璁板綍缁撴潫
+ */
+
+ return flag;
}
/**
@@ -199,9 +228,42 @@
return updateById(one);
}
- public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword) {
+ public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
+ //鎺掑簭瀛楁
+ String orderByResult = OrderByEnums.ADMIN_ID.getCode();
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.ADMIN_ID.getCode();
+ break;
+ case 2:
+ orderByResult = OrderByEnums.ADMIN_CREATE_TIME.getCode();
+ break;
+ case 3:
+ orderByResult = OrderByEnums.ADMIN_LOGIN_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = OrderByEnums.ASC.getCode();
+ break;
+ case 2:
+ orderBySeq = OrderByEnums.DESC.getCode();
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
if (baseConditionVO != null) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
}
return adminMapper.listAdmin(keyword);
--
Gitblit v1.9.3