From 781564409e34d9881e3f27ebc110161e4232f5ed Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 17:32:15 +0800
Subject: [PATCH] 客户新增优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 12 +++++++-----
2 files changed, 47 insertions(+), 12 deletions(-)
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 6dab943..ae372e9 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
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.controller;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -17,7 +16,10 @@
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.ClientDto;
-import com.sandu.ximon.admin.param.*;
+import com.sandu.ximon.admin.param.AddClientPrarm;
+import com.sandu.ximon.admin.param.AdminLoginParam;
+import com.sandu.ximon.admin.param.UpdateClientPrarm;
+import com.sandu.ximon.admin.param.UserPwsParm;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientRoleRelationService;
@@ -57,9 +59,9 @@
@PostMapping("/add")
public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
- if (!permissionConfig.check(MenuEnum.CLIENT_ADD.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
+// if (!permissionConfig.check(MenuEnum.CLIENT_ADD.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
boolean b = clientService.addClient(addClientPrarm);
if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
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 dc4e402..104453e 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
@@ -6,19 +6,21 @@
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.*;
+import com.sandu.ximon.admin.param.AddClientPrarm;
+import com.sandu.ximon.admin.param.PwdParam;
+import com.sandu.ximon.admin.param.UpdateClientPrarm;
+import com.sandu.ximon.admin.param.UserPwsParm;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.dao.domain.Admin;
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;
import java.util.List;
+import java.util.Objects;
@Service
@AllArgsConstructor
@@ -35,13 +37,27 @@
if (getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientName().trim())) != null) {
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
+// Long userId = SecurityUtils.getUserId();
+ boolean clientId = findClientId();
+ //鍒ゆ柇鏄惁涓轰簩绾у鎴� 濡傛灉鏄簩绾у鎴峰垯涓嶈兘缁х画娣诲姞
+ if (SecurityUtils.getClientId() != null && !clientId) {
+ throw new BusinessException("鏉冮檺涓嶈冻,浜岀骇瀹㈡埛涓嶈兘鏂板鐢ㄦ埛锛�");
+ }
+
Client client = new Client();
- if (addClientPrarm.getClientSuperior() != null && !"".equals(addClientPrarm.getClientSuperior())) {
+
+ if (SecurityUtils.getClientId() != null && clientId) {
+ //涓�绾у鎴锋柊澧炵敤鎴锋椂 榛樿涓鸿嚜宸卞悕涓嬬殑浜岀骇瀹㈡埛
+ client.setSuperiorId(SecurityUtils.getUserId());
+ client.setClientSuperior(addClientPrarm.getClientSuperior());
+ } else if (addClientPrarm.getClientSuperior() != null && !"".equals(addClientPrarm.getClientSuperior())) {
+ //瓒呯
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, addClientPrarm.getClientSuperior()));
if (one != null) {
if (one.getSuperiorId() == null) {
client.setSuperiorId(one.getId());
+ client.setClientSuperior(addClientPrarm.getClientSuperior());
} else {
throw new BusinessException("涓婄骇瀹㈡埛涓嶈兘涓轰簩绾х敤鎴�");
}
@@ -61,8 +77,11 @@
client.setClientName(addClientPrarm.getClientName());
client.setLinkMan(addClientPrarm.getLinkMan());
+// client.setClientSuperior(addClientPrarm.getClientSuperior());
client.setMobile(addClientPrarm.getMobile());
- client.setClientSuperior(addClientPrarm.getClientSuperior());
+ if (SecurityUtils.getClientId() != null && clientId) {
+ client.setClientSuperior(SecurityUtils.getUsername());
+ }
client.setPassword(passwordEncoder.encode(addClientPrarm.getPassword()));
boolean flag = save(client);
@@ -90,8 +109,22 @@
throw new BusinessException("璇ョ敤鎴峰悕宸插瓨鍦紒");
}
//鍒ゆ柇涓婄骇鐢ㄦ埛鏄惁瀛樺湪
+ boolean clientId = findClientId();
+
+ //鍒ゆ柇鏇存敼鐨勭敤鎴锋槸鍚︽槸灞炰簬鑷繁鍚嶄笅鐨勪簩绾у鎴�
+ if(SecurityUtils.getClientId() != null && clientId){
+ if(!Objects.equals(one.getSuperiorId(), SecurityUtils.getUserId())){
+ throw new BusinessException("鏉冮檺涓嶈冻锛屼笉鑳芥洿鏀瑰叾浠栧鎴风殑鎵�灞炲鎴蜂俊鎭紒");
+ }
+ }
+
Client client = new Client();
- if (updateClientPrarm.getClientSuperior() != null && updateClientPrarm.getClientSuperior().trim().length() != 0) {
+ if (SecurityUtils.getClientId() != null && clientId) {
+ //涓�绾у鎴锋柊澧炵敤鎴锋椂 榛樿涓鸿嚜宸卞悕涓嬬殑浜岀骇瀹㈡埛
+ client.setSuperiorId(SecurityUtils.getUserId());
+ client.setClientSuperior(updateClientPrarm.getClientSuperior());
+ } else 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())) {
@@ -105,7 +138,7 @@
}
}
client.setId(id);
- client.setClientName(updateClientPrarm.getClientName());
+// client.setClientName(updateClientPrarm.getClientName());
client.setLinkMan(updateClientPrarm.getLinkMan());
client.setMobile(updateClientPrarm.getMobile());
--
Gitblit v1.9.3