From 0cf3070d6e16b27b3cd467c3fda28f659aa7980e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 11:18:04 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 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 019a5f0..2b07378 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
@@ -8,20 +8,23 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
+import com.sandu.ximon.admin.param.UserPwsParm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.AdminBo;
-import com.sandu.ximon.dao.domain.Admin;
-import com.sandu.ximon.dao.domain.AdminRoleRelation;
-import com.sandu.ximon.dao.domain.Client;
-import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.dao.bo.MenuNode;
+import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
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;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -111,22 +114,44 @@
return true;
}
+ /**
+ * 淇敼褰撳墠鐧诲綍鐢ㄦ埛瀵嗙爜
+ *
+ * @param param
+ * @return
+ */
public boolean updateMyPassword(PwdParam param) {
- if (!StrUtil.equals(param.getNewPass(), param.getConfirmPass())) {
- throw new BusinessException("涓ゆ瀵嗙爜涓嶄竴鑷�");
- }
Long userId = SecurityUtils.getUserId();
Admin admin = getById(userId);
if (admin == null) {
throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
}
- if (!passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
- throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘");
+ //鍒ゆ柇鏃у瘑鐮佷笌鏁版嵁搴撴槸鍚︿竴鑷�
+ if (passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
+ //鍔犲瘑鏂板瘑鐮�
+ admin.setId(userId);
+ admin.setPassword(passwordEncoder.encode(param.getNewPass()));
+ return updateById(admin);
+ } else {
+ throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘锛岃閲嶆柊纭瀵嗙爜锛�");
}
- Admin update = new Admin();
- update.setId(userId);
- update.setPassword(passwordEncoder.encode(param.getNewPass()));
- return updateById(update);
+ }
+
+ /**
+ * 淇敼绠＄悊鍛樼殑瀵嗙爜
+ *
+ * @param param
+ * @return
+ */
+ public boolean updateAdminPassword(UserPwsParm param) {
+ Admin admin = getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getId, param.getUserid()));
+ if (admin == null) {
+ throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+
+ //鍔犲瘑鏂板瘑鐮�
+ admin.setPassword(passwordEncoder.encode(param.getNewPass()));
+ return updateById(admin);
}
public boolean deleteAdmin(Long adminId) {
@@ -171,4 +196,42 @@
return adminMapper.listAdmin(keyword);
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏉冮檺鍒楄〃鍦�
+ */
+ public List<MenuNode> getUserPermissionList() {
+ List<MenuNode> resultList;
+ //鍒ゆ柇瓒呯涓庢櫘閫氱鐞嗗憳
+ if (SecurityUtils.getAdministratorIdentity().equals(AdministratorEnums.ADMIN.getCode())) {
+ //鍙傛暟涓簄ull鏃讹紝鑾峰彇鎵�鏈夌殑鑿滃崟鏉冮檺
+ resultList = SpringContextHolder.getBean(MenuService.class).getUserPermissionListById(null);
+ } else {
+ //閫氳繃鐢ㄦ埛UserID鑾峰彇鐢ㄦ埛瑙掕壊
+ AdminRoleRelation one = SpringContextHolder.getBean(AdminRoleRelationService.class).
+ getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, SecurityUtils.getUserId()));
+ //鍒ょ┖
+ if (one == null) {
+ throw new BusinessException("璇ョ敤鎴锋湭缁戝畾瑙掕壊");
+ }
+
+ //閫氳繃RoleID鑾峰彇MeunId鍒楄〃
+ List<RoleMenuRelation> menuIdList = SpringContextHolder.getBean(RoleMenuRelationService.class)
+ .list(Wrappers.lambdaQuery(RoleMenuRelation.class).eq(RoleMenuRelation::getRoleId, one.getRoleId()));
+
+ //鍒ょ┖
+ if (menuIdList.isEmpty()) {
+ return new ArrayList<>();
+ }
+ List<Long> menuIds = new ArrayList<>(menuIdList.size());
+ for (RoleMenuRelation bean : menuIdList) {
+ menuIds.add(bean.getMenuId());
+ }
+
+ resultList = SpringContextHolder.getBean(MenuService.class).getUserPermissionListById(menuIds);
+
+ }
+
+ return resultList;
+ }
}
--
Gitblit v1.9.3