From 0bbba0fe5cfc2c37eafecfd70d45930165ba1930 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 08 三月 2022 14:05:56 +0800
Subject: [PATCH] 用户新增密码字段
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 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 934a95a..e6bd78d 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,12 +1,16 @@
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.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;
@@ -16,10 +20,17 @@
public class ClientService extends BaseServiceImpl<ClientMapper, Client> {
private final ClientMapper clientMapper;
+ private final PasswordEncoder passwordEncoder;
+
public boolean addClient(ClientPrarm clientPrarm) {
+
+ if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim())) != null) {
+ throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
+ }
+
Client client = new Client();
- if (clientPrarm.getClientSuperior() != null) {
+ if (clientPrarm.getClientSuperior() != null && !"".equals(clientPrarm.getClientSuperior())) {
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
if (one != null) {
client.setSuperiorId(one.getId());
@@ -31,6 +42,7 @@
client.setLinkMan(clientPrarm.getLinkMan());
client.setMobile(clientPrarm.getMobile());
client.setClientSuperior(clientPrarm.getClientSuperior());
+ client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));
return save(client);
@@ -38,16 +50,26 @@
public boolean updateClient(Long id, ClientPrarm clientPrarm) {
- //Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, id));
+ //鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪
Client one = getById(id);
if (one == null) {
throw new BusinessException("璇ュ鎴蜂笉瀛樺湪");
}
+
+ //鍒ゆ柇鐢ㄦ埛鍚嶆槸鍚﹂噸澶�
+ if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientName().trim())) != null) {
+ throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
+ }
+ //鍒ゆ柇涓婄骇鐢ㄦ埛鏄惁瀛樺湪
Client client = new Client();
if (clientPrarm.getClientSuperior() != null) {
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());
+ }
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
@@ -57,24 +79,68 @@
client.setLinkMan(clientPrarm.getLinkMan());
client.setMobile(clientPrarm.getMobile());
client.setClientSuperior(clientPrarm.getClientSuperior());
+ client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));
// 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) {
- return clientMapper.clientList(userId);
+ 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() {
+ Long userId = SecurityUtils.getUserId();
+ Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
+ if (one != null && one.getSuperiorId() != null) {
+ return one.getSuperiorId();
+ } else {
+ return userId;
+ }
+
+ }
+
+ /**
+ * 涓�绾у鎴疯繑鍥瀎alse 浜岀骇瀹㈡埛杩斿洖true
+ *
+ * @return
+ */
+ public boolean findClientId() {
+ Long userId = SecurityUtils.getUserId();
+ Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
+ if (one != null && one.getSuperiorId() != null) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
}
--
Gitblit v1.9.3