From 66566630296de0891f440ce853dddefa30333503 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 21 四月 2022 10:08:36 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 071225b..287affc 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
@@ -16,7 +16,9 @@
import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AddClientPrarm;
import com.sandu.ximon.admin.param.AdminLoginParam;
+import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
import com.sandu.ximon.admin.param.UpdateClientPrarm;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.ClientRoleRelationService;
import com.sandu.ximon.admin.service.ClientService;
@@ -24,6 +26,7 @@
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -48,6 +51,7 @@
private final RoleService roleService;
private final ClientRoleRelationService clientRoleRelationService;
private final TokenProvider tokenProvider;
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
@@ -70,6 +74,16 @@
}
}
+ @PostMapping("/resetClientPassword")
+ public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
+ boolean b = clientService.resetPassword(resetClientPasswordPrarm);
+ if (b) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
+
@PostMapping("/delete/{id}")
public ResponseVO<Object> deleteClient(@PathVariable Long id) {
boolean b = clientService.deleteClient(id);
@@ -82,12 +96,16 @@
@GetMapping("/list")
public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
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 (null != keyword) {
+ if (keyword != null && !keyword.isEmpty()) {
wrapper.like(Client::getClientName, keyword)
.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
.or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
--
Gitblit v1.9.3