From bef458cd14d2e0f2b09d76b609291f47be3cd525 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 16:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 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 efe7faf..9ecfcb2 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,11 +1,12 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
+import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
@@ -13,17 +14,17 @@
import com.sandu.common.security.token.TokenProvider;
import com.sandu.common.util.IpUtil;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.context.CustomerInspectContextHolder;
-import com.sandu.ximon.admin.param.AddClientPrarm;
-import com.sandu.ximon.admin.param.AdminLoginParam;
-import com.sandu.ximon.admin.param.ClientPrarm;
+import com.sandu.ximon.admin.dto.ClientDto;
+import com.sandu.ximon.admin.param.*;
+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;
import com.sandu.ximon.admin.service.RoleService;
-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.enums.AdministratorEnums;
-import jodd.cli.Cli;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -31,9 +32,7 @@
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -48,7 +47,9 @@
private final ClientService clientService;
private final PasswordEncoder passwordEncoder;
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) {
@@ -62,12 +63,27 @@
@PostMapping("/update/{id}")
- public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated ClientPrarm clientPrarm) {
- boolean b = clientService.updateClient(id, clientPrarm);
+ public ResponseVO<Object> updateClient(@PathVariable Long id, @RequestBody @Validated UpdateClientPrarm updateClientPrarm) {
+ boolean b = clientService.updateClient(id, updateClientPrarm);
if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
} else {
return ResponseUtil.fail("鏇存柊澶辫触");
+ }
+ }
+
+ /**
+ * 淇敼鏅�氱敤鎴风殑瀵嗙爜
+ */
+ @Log("淇敼鏅�氱敤鎴风殑瀵嗙爜")
+ @PostMapping("/updateClientPassword")
+ public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
+ boolean result = clientService.updateAdminPassword(param);
+
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
}
}
@@ -83,17 +99,36 @@
@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));
}
- return ResponseUtil.successPage(clientService.list(wrapper));
+ List<Client> clientList = clientService.list(wrapper);
+ List<ClientDto> clientDtoList = new ArrayList<>();
+
+ for (Client demo : clientList) {
+ ClientDto clientDto = new ClientDto();
+ BeanUtil.copyProperties(demo, clientDto);
+ ClientRoleRelation one = clientRoleRelationService.getOne(Wrappers.lambdaQuery(ClientRoleRelation.class)
+ .eq(ClientRoleRelation::getClientId, demo.getId()));
+
+ if (one != null) {
+ clientDto.setRoleId(one.getRoleId());
+ }
+ clientDtoList.add(clientDto);
+
+ }
+ return ResponseUtil.successPage(clientDtoList);
}
@AnonymousAccess
@@ -107,14 +142,14 @@
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
-// Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId());
+ Collection<GrantedAuthority> grantedAuthorities = roleService.mapToGrantedAuthorities(client.getId(), false);
LoginUserInfo loginUserInfo = new LoginUserInfo();
loginUserInfo.setUserId(client.getId());
loginUserInfo.setAccount(client.getClientName());
loginUserInfo.setIp(IpUtil.getRealIp());
loginUserInfo.setAdministratorType(AdministratorEnums.NORMAL.getCode());
-// loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
+ loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
// 鐢熸垚浠ょ墝
String token = tokenProvider.createToken(loginUserInfo);
--
Gitblit v1.9.3