From e217e2ae4e30304cd678fd8fee9e7e860aceae2a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 09 三月 2022 14:21:39 +0800
Subject: [PATCH] 普通用户登录fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 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 bb8aae7..9da3101 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
@@ -1,14 +1,17 @@
package com.sandu.ximon.admin.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.AddClientPrarm;
import com.sandu.ximon.admin.param.ClientPrarm;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.mapper.ClientMapper;
import lombok.AllArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -18,21 +21,29 @@
public class ClientService extends BaseServiceImpl<ClientMapper, Client> {
private final ClientMapper clientMapper;
+ private final PasswordEncoder passwordEncoder;
- public boolean addClient(ClientPrarm clientPrarm) {
+
+ public boolean addClient(AddClientPrarm addClientPrarm) {
+
+ if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientName().trim())) != null) {
+ throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
+ }
+
Client client = new Client();
- if (clientPrarm.getClientSuperior() != null&&!"".equals(clientPrarm.getClientSuperior())) {
- Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
+ 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());
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
}
- client.setClientName(clientPrarm.getClientName());
- client.setLinkMan(clientPrarm.getLinkMan());
- client.setMobile(clientPrarm.getMobile());
- client.setClientSuperior(clientPrarm.getClientSuperior());
+ client.setClientName(addClientPrarm.getClientName());
+ client.setLinkMan(addClientPrarm.getLinkMan());
+ client.setMobile(addClientPrarm.getMobile());
+ client.setClientSuperior(addClientPrarm.getClientSuperior());
+ client.setPassword(passwordEncoder.encode(addClientPrarm.getPassword()));
return save(client);
@@ -40,15 +51,28 @@
public boolean updateClient(Long id, ClientPrarm clientPrarm) {
+ //鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪
Client one = getById(id);
if (one == null) {
throw new BusinessException("璇ュ鎴蜂笉瀛樺湪");
}
+
+ //鍒ゆ柇鐢ㄦ埛鍚嶆槸鍚﹂噸澶�
+ Client client1 = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim()));
+ if (client1 != null && !client1.getId().equals(one.getId())) {
+ throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
+ }
+ //鍒ゆ柇涓婄骇鐢ㄦ埛鏄惁瀛樺湪
Client client = new Client();
- if (clientPrarm.getClientSuperior() != null) {
+ if (clientPrarm.getClientSuperior() != null && clientPrarm.getClientSuperior().trim().length() != 0) {
Client superior = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
- if (one != null) {
- client.setSuperiorId(superior.getId());
+ if (superior != null) {
+ if (superior.getId().equals(one.getId())) {
+ throw new BusinessException("涓婄骇瀹㈡埛涓烘湰璐︽埛锛�");
+ } else {
+ client.setSuperiorId(superior.getId());
+ client.setClientSuperior(clientPrarm.getClientSuperior());
+ }
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
@@ -57,39 +81,49 @@
client.setClientName(clientPrarm.getClientName());
client.setLinkMan(clientPrarm.getLinkMan());
client.setMobile(clientPrarm.getMobile());
- client.setClientSuperior(clientPrarm.getClientSuperior());
// update(client);
return updateById(client);
}
public boolean deleteClient(Long id) {
+ //鍒ゆ柇鍒犻櫎鐢ㄦ埛鏄惁瀛樺湪
Client one = getById(id);
if (one == null) {
throw new BusinessException("璇ュ鎴蜂笉瀛樺湪");
}
+
+ //鍒ゆ柇鍒犻櫎鐨勭敤鎴锋湁鏃犱笅绾х敤鎴�
+ LambdaQueryWrapper<Client> lambdaQueryWrapper = Wrappers.lambdaQuery(Client.class).eq(Client::getSuperiorId, id);
+ List<Client> list = list(lambdaQueryWrapper);
+ if (list != null && list.size() != 0) {
+ throw new BusinessException("鍒犻櫎鐨勭敤鎴蜂笅鏈変笅绾х敤鎴凤紝涓嶅厑璁稿垹闄�");
+ }
+
return removeById(id);
}
- public List<Client> clientList(Long userId, BaseConditionVO baseConditionVO) {
- return clientMapper.clientList(userId,baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ public List<Client> clientList(Long userId, BaseConditionVO baseConditionVO) {
+ return clientMapper.clientList(userId, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
}
public Client findByPhone(String phone) {
return getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getMobile, phone).last("limit 1"));
}
- /**\
+ /**
+ * \
* 鍏朵粬绫荤敤鏉ユ煡鎵惧鎴穒d浣跨敤 濡傛灉娌℃湁涓婄骇瀹㈡埛 杩欒繑鍥炵敤鎴稩D
+ *
* @param
* @return
*/
- public Long getClientId(){
+ public Long getClientId() {
Long userId = SecurityUtils.getUserId();
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
- if(one!=null&&one.getSuperiorId()!=null){
+ if (one != null && one.getSuperiorId() != null) {
return one.getSuperiorId();
- }else {
+ } else {
return userId;
}
@@ -97,14 +131,15 @@
/**
* 涓�绾у鎴疯繑鍥瀎alse 浜岀骇瀹㈡埛杩斿洖true
+ *
* @return
*/
- public boolean findClientId(){
+ public boolean findClientId() {
Long userId = SecurityUtils.getUserId();
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
- if(one!=null&&one.getSuperiorId()!=null){
+ if (one != null && one.getSuperiorId() != null) {
return true;
- }else {
+ } else {
return false;
}
--
Gitblit v1.9.3