From ab060213fe5b62ba8bf9b87c8a93ba7e9fea05db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期六, 02 四月 2022 11:39:01 +0800
Subject: [PATCH] 单灯数据导出
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 671ed5a..1b23cc8 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
@@ -71,29 +71,43 @@
return true;
}
+ @Transactional(rollbackFor = Exception.class)
public boolean updateAdmin(Long adminId, AdminParam param) {
Admin admin = getById(adminId);
- if(admin == null){
+ if (admin == null) {
throw new BusinessException("鎵句笉鍒扮鐞嗗憳");
}
List<Role> roles = roleService.listByAdminId(admin.getId());
- if(CollectionUtil.isEmpty(roles)){
+ if (CollectionUtil.isEmpty(roles)) {
throw new BusinessException("褰撳墠鐢ㄦ埛娌℃湁瑙掕壊");
}
List<Integer> levels = roles.stream().map(Role::getLevel).collect(Collectors.toList());
int min = Collections.min(levels);
roleService.assertLevels(min);
+
Admin update = new Admin();
update.setId(adminId);
update.setPassword(passwordEncoder.encode(param.getPassword()));
update.setNickName(param.getNickName());
update.setMobile(param.getMobile());
update.setNote(param.getNote());
- return updateById(update);
+ if (!updateById(update)) {
+ throw new BusinessException("缂栬緫绠＄悊鍛樺け璐�");
+ }
+
+ adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId,admin.getId()));
+ AdminRoleRelation adminRoleRelation = new AdminRoleRelation();
+ adminRoleRelation.setAdminId(adminId);
+ adminRoleRelation.setRoleId(param.getRoleId());
+ if (!adminRoleRelationService.save(adminRoleRelation)) {
+ throw new BusinessException("娣诲姞绠＄悊鍛樿鑹插け璐�");
+ }
+
+ return true;
}
public boolean updateMyPassword(PwdParam param) {
- if(!StrUtil.equals(param.getNewPass(),param.getConfirmPass())){
+ if (!StrUtil.equals(param.getNewPass(), param.getConfirmPass())) {
throw new BusinessException("涓ゆ瀵嗙爜涓嶄竴鑷�");
}
Long userId = SecurityUtils.getUserId();
@@ -101,7 +115,7 @@
if (admin == null) {
throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
}
- if(!passwordEncoder.matches(param.getOldPass(),admin.getPassword())){
+ if (!passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘");
}
Admin update = new Admin();
@@ -109,4 +123,23 @@
update.setPassword(passwordEncoder.encode(param.getNewPass()));
return updateById(update);
}
+
+ public boolean deleteAdmin(Long adminId) {
+ 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)){
+ throw new BusinessException("鍙湁瓒呯骇绠＄悊鍛樻墠鑳藉垹闄ょ敤鎴�");
+ }
+
+ return removeById(adminId);
+ }
}
--
Gitblit v1.9.3