From 21c1a691e7018967a429c276e6642c17e61ed778 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 22 四月 2022 14:54:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 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 1b23cc8..61feeff 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
@@ -3,14 +3,18 @@
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;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
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.mapper.AdminMapper;
import lombok.AllArgsConstructor;
@@ -33,6 +37,7 @@
private final PasswordEncoder passwordEncoder;
private final AdminRoleRelationService adminRoleRelationService;
private final RoleService roleService;
+ private AdminMapper adminMapper;
public Admin findByUserName(String username) {
return getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, username).last("limit 1"));
@@ -95,7 +100,7 @@
throw new BusinessException("缂栬緫绠＄悊鍛樺け璐�");
}
- adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId,admin.getId()));
+ adminRoleRelationService.remove(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, admin.getId()));
AdminRoleRelation adminRoleRelation = new AdminRoleRelation();
adminRoleRelation.setAdminId(adminId);
adminRoleRelation.setRoleId(param.getRoleId());
@@ -106,6 +111,11 @@
return true;
}
+ /**
+ * 淇敼瀵嗙爜
+ * @param param
+ * @return
+ */
public boolean updateMyPassword(PwdParam param) {
if (!StrUtil.equals(param.getNewPass(), param.getConfirmPass())) {
throw new BusinessException("涓ゆ瀵嗙爜涓嶄竴鑷�");
@@ -115,9 +125,9 @@
if (admin == null) {
throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
}
- if (!passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
- throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘");
- }
+// if (!passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
+// throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘");
+// }
Admin update = new Admin();
update.setId(userId);
update.setPassword(passwordEncoder.encode(param.getNewPass()));
@@ -136,10 +146,34 @@
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 (!RoleLevelStatus.SUPER.getCode().equals(maxLevel)) {
throw new BusinessException("鍙湁瓒呯骇绠＄悊鍛樻墠鑳藉垹闄ょ敤鎴�");
}
return removeById(adminId);
}
+
+ /**
+ * 淇敼瓒呯骇绠＄悊鍛樸�佺鐞嗗憳鐢ㄦ埛澶村儚
+ *
+ * @param userId
+ * @param IconUrl
+ * @return
+ */
+ public boolean updateIcon(Long userId, String IconUrl) {
+ Admin one = getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getId, userId));
+ if (one == null) {
+ throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ one.setIcon(IconUrl);
+ return updateById(one);
+ }
+
+ public List<AdminBo> listAdmin(BaseConditionVO baseConditionVO, String keyword) {
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+
+ return adminMapper.listAdmin(keyword);
+ }
}
--
Gitblit v1.9.3