From 89b46667dc80617e806088a6cd7ceb77fe53a9a6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期六, 07 五月 2022 18:06:11 +0800
Subject: [PATCH] 固件升级
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 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..768d3f3 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
@@ -10,6 +10,7 @@
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.param.UserPwsParm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.AdminBo;
import com.sandu.ximon.dao.domain.Admin;
@@ -111,22 +112,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) {
--
Gitblit v1.9.3