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 | 58 +++++++++++++++++++++++------
ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java | 2 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 37 +++++++++---------
dao/src/main/resources/mapper/ClientMapper.xml | 1
dao/src/main/java/com/sandu/ximon/dao/domain/Client.java | 5 ++
5 files changed, 73 insertions(+), 30 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Client.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Client.java
index 0b56a81..0883fdf 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Client.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Client.java
@@ -43,6 +43,11 @@
*/
private String mobile;
+ /**
+ * 瀵嗙爜
+ */
+ private String password;
+
/*鐏潌鏁伴噺*/
private Integer countLight;
diff --git a/dao/src/main/resources/mapper/ClientMapper.xml b/dao/src/main/resources/mapper/ClientMapper.xml
index 63d0738..cf57555 100644
--- a/dao/src/main/resources/mapper/ClientMapper.xml
+++ b/dao/src/main/resources/mapper/ClientMapper.xml
@@ -10,6 +10,7 @@
<result property="clientSuperior" column="client_superior" jdbcType="VARCHAR"/>
<result property="linkMan" column="linkman" jdbcType="VARCHAR"/>
<result property="mobile" column="mobile" jdbcType="VARCHAR"/>
+ <result property="password" column="password" jdbcType="VARCHAR"/>
<result property="countLight" column="count_light" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 340712d..94aa0d8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -13,10 +13,11 @@
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
- *瀹㈡埛妯″潡
+ * 瀹㈡埛妯″潡
*/
@RestController
@AllArgsConstructor
@@ -26,32 +27,32 @@
private final ClientService clientService;
@PostMapping("/add")
- public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
+ public ResponseVO<Object> addClient(@RequestBody @Validated ClientPrarm clientPrarm) {
boolean b = clientService.addClient(clientPrarm);
- if(b){
+ if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("娣诲姞澶辫触");
}
}
- @PostMapping ("/update/{id}")
- public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
- boolean b = clientService.updateClient(id,clientPrarm);
- if(b){
+ @PostMapping("/update/{id}")
+ public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated ClientPrarm clientPrarm) {
+ boolean b = clientService.updateClient(id, clientPrarm);
+ if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鏇存柊澶辫触");
}
}
@PostMapping("/delete/{id}")
- public ResponseVO<Object> deleteClient(@PathVariable Long id){
+ public ResponseVO<Object> deleteClient(@PathVariable Long id) {
boolean b = clientService.deleteClient(id);
- if(b){
+ if (b) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鍒犻櫎澶辫触");
}
}
@@ -72,13 +73,13 @@
public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
- if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
- wrapper.eq(Client::getSuperiorId,SecurityUtils.getUserId());
+ if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId());
}
- if(null!=keyword){
- wrapper.like(Client::getClientName,keyword)
- .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile,keyword))
- .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan,keyword));
+ if (null != keyword) {
+ wrapper.like(Client::getClientName, keyword)
+ .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
+ .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
}
return ResponseUtil.successPage(clientService.list(wrapper));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java
index 301a845..8689c97 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/ClientPrarm.java
@@ -15,5 +15,7 @@
private String linkMan;
@NotEmpty
private String mobile;
+ @NotEmpty
+ private String password;
}
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..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,5 +1,6 @@
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;
@@ -9,6 +10,7 @@
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,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&&!"".equals(clientPrarm.getClientSuperior())) {
+ 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());
@@ -33,6 +42,7 @@
client.setLinkMan(clientPrarm.getLinkMan());
client.setMobile(clientPrarm.getMobile());
client.setClientSuperior(clientPrarm.getClientSuperior());
+ client.setPassword(passwordEncoder.encode(clientPrarm.getPassword()));
return save(client);
@@ -40,15 +50,26 @@
public boolean updateClient(Long id, ClientPrarm clientPrarm) {
+ //鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪
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("涓婄骇瀹㈡埛涓嶅瓨鍦�");
}
@@ -58,38 +79,50 @@
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, 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 +130,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