From 34cc9fb821d30b64947c8a62d952f1621a515149 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 21 三月 2022 10:32:51 +0800
Subject: [PATCH] 普通用户修改密码
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 8b02c43..376c204 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -7,13 +7,15 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.AddClientPrarm;
-import com.sandu.ximon.admin.param.ClientPrarm;
+import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
+import com.sandu.ximon.admin.param.UpdateClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.mapper.ClientMapper;
import lombok.AllArgsConstructor;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
@@ -39,7 +41,11 @@
if (addClientPrarm.getClientSuperior() != null && !"".equals(addClientPrarm.getClientSuperior())) {
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientSuperior()));
if (one != null) {
- client.setSuperiorId(one.getId());
+ if (one.getSuperiorId() == null) {
+ client.setSuperiorId(one.getId());
+ } else {
+ throw new BusinessException("涓婄骇瀹㈡埛涓嶈兘涓轰簩绾х敤鎴�");
+ }
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
@@ -72,7 +78,7 @@
}
- public boolean updateClient(Long id, ClientPrarm clientPrarm) {
+ public boolean updateClient(Long id, UpdateClientPrarm updateClientPrarm) {
//鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪
Client one = getById(id);
if (one == null) {
@@ -80,34 +86,53 @@
}
//鍒ゆ柇鐢ㄦ埛鍚嶆槸鍚﹂噸澶�
- Client client1 = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim()));
+ Client client1 = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, updateClientPrarm.getClientName().trim()));
if (client1 != null && !client1.getId().equals(one.getId())) {
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
//鍒ゆ柇涓婄骇鐢ㄦ埛鏄惁瀛樺湪
Client client = new Client();
- if (clientPrarm.getClientSuperior() != null && clientPrarm.getClientSuperior().trim().length() != 0) {
- Client superior = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
+ if (updateClientPrarm.getClientSuperior() != null && updateClientPrarm.getClientSuperior().trim().length() != 0) {
+ Client superior = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, updateClientPrarm.getClientSuperior()));
if (superior != null) {
if (superior.getId().equals(one.getId())) {
throw new BusinessException("涓婄骇瀹㈡埛涓烘湰璐︽埛锛�");
} else {
client.setSuperiorId(superior.getId());
- client.setClientSuperior(clientPrarm.getClientSuperior());
+ client.setClientSuperior(updateClientPrarm.getClientSuperior());
}
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
}
client.setId(id);
- client.setClientName(clientPrarm.getClientName());
- client.setLinkMan(clientPrarm.getLinkMan());
- client.setMobile(clientPrarm.getMobile());
+ client.setClientName(updateClientPrarm.getClientName());
+ client.setLinkMan(updateClientPrarm.getLinkMan());
+ client.setMobile(updateClientPrarm.getMobile());
// update(client);
return updateById(client);
}
+ public boolean resetPassword(ResetClientPasswordPrarm resetClientPasswordPrarm) {
+ Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, resetClientPasswordPrarm.getId()));
+
+ if (client == null) {
+ throw new BusinessException("璇ョ敤鎴蜂笉瀛樺湪锛�");
+ }
+
+ PasswordEncoder pw = new BCryptPasswordEncoder();
+ //鍒ゆ柇鏃у瘑鐮佷笌鏁版嵁搴撴槸鍚︿竴鑷�
+ if (pw.matches(resetClientPasswordPrarm.getOldPassword(), client.getPassword())) {
+ //鍔犲瘑鏂板瘑鐮�
+ String encode = pw.encode(resetClientPasswordPrarm.getNewPassword());
+ client.setPassword(encode);
+ return updateById(client);
+ } else {
+ throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘锛岃閲嶆柊纭瀵嗙爜锛�");
+ }
+ }
+
public boolean deleteClient(Long id) {
//鍒ゆ柇鍒犻櫎鐢ㄦ埛鏄惁瀛樺湪
Client one = getById(id);
--
Gitblit v1.9.3