From f214709cf1d896e7c9743f206b7a708f020e5322 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 17:54:03 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 200 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 167 insertions(+), 33 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 d1bcc46..243484b 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,75 +1,209 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.extra.servlet.ServletUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.enums.ResponseStatusEnums;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.log.Log;
+import com.sandu.common.security.LoginUserInfo;
+import com.sandu.common.security.annotation.AnonymousAccess;
+import com.sandu.common.security.config.SecurityProperties;
+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.ClientPrarm;
+import com.sandu.ximon.admin.dto.ClientDtoNode;
+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;
import com.sandu.ximon.admin.service.ClientService;
+import com.sandu.ximon.admin.service.RoleService;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.enums.MenuEnum;
+import eu.bitwalker.useragentutils.Browser;
+import eu.bitwalker.useragentutils.OperatingSystem;
+import eu.bitwalker.useragentutils.UserAgent;
import lombok.AllArgsConstructor;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
- *瀹㈡埛妯″潡
+ * 瀹㈡埛妯″潡
*/
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")
public class ClientController {
+ private final SecurityProperties properties;
private final ClientService clientService;
+ private final PasswordEncoder passwordEncoder;
+ private final RoleService roleService;
+ private final ClientRoleRelationService clientRoleRelationService;
+ private final TokenProvider tokenProvider;
+ private PermissionConfig permissionConfig;
- @GetMapping("/add")
- public ResponseVO<Object> addClient(@RequestBody ClientPrarm clientPrarm){
- boolean b = clientService.addClient(clientPrarm);
- if(b){
+ @PostMapping("/add")
+ public ResponseVO<Object> addClient(@RequestBody @Validated AddClientPrarm addClientPrarm) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean b = clientService.addClient(addClientPrarm);
+ if (b) {
return ResponseUtil.success("娣诲姞鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("娣诲姞澶辫触");
}
}
- @GetMapping ("/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 UpdateClientPrarm updateClientPrarm) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_INFO_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean b = clientService.updateClient(id, updateClientPrarm);
+ if (b) {
return ResponseUtil.success("鏇存柊鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鏇存柊澶辫触");
}
}
- @GetMapping("/delete/{id}")
- public ResponseVO<Object> deleteClient(@PathVariable Long id){
+ /**
+ * 淇敼鏅�氱敤鎴风殑瀵嗙爜
+ */
+ @Log("淇敼鏅�氱敤鎴风殑瀵嗙爜")
+ @PostMapping("/updateClientPassword")
+ public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
+ boolean result;
+
+ //瓒呯鐩存帴淇敼
+ if (SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ result = clientService.updateAdminPassword(param);
+ } else {
+ //褰撳墠鐧诲綍璐﹀彿ID
+ Long userId = SecurityUtils.getUserId();
+ //瑕佷慨瑕佸瘑鐮佺殑鐢ㄦ埛鐨勪笂绾D
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, param.getUserid()));
+ //涓哄叾涓嬪睘鎵嶈兘淇敼
+ if (client != null && userId.equals(client.getSuperiorId())) {
+ result = clientService.updateAdminPassword(param);
+ } else {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鎴栬鐢ㄦ埛涓嶆槸鎮ㄤ笅灞炵敤鎴凤紝鏃犳硶淇敼瀵嗙爜锛�");
+ }
+ }
+
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+
+ }
+
+ @PostMapping("/delete/{id}")
+ public ResponseVO<Object> deleteClient(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean b = clientService.deleteClient(id);
- if(b){
+ if (b) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
- }else {
+ } else {
return ResponseUtil.fail("鍒犻櫎澶辫触");
}
}
+ @GetMapping("/list")
+ public ResponseVO<Object> listLikeClient(@RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
+ if (!permissionConfig.check(MenuEnum.CLIENT_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<ClientDtoNode> clientDtoNodes = clientService.listLikeClient(keyword, order, seq);
- @PostMapping("/list")
- public ResponseVO<Object> listClient(){
- // Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 涓虹鐞嗗憳
- /* if(administratorIdentity==0){//鍒ゆ柇 濡傛灉鏄鐞嗗憳 灏卞垽鏂笅CustomerInspectContextHolder.getCustomerId() 鏈夋病鏈夊��
- // Long customerId = CustomerInspectContextHolder.getCustomerId();
- if(customerId!=null){
- return ResponseUtil.success(clientService.list());
- }
- return ResponseUtil.success(clientService.list());
- }else {
+ return ResponseUtil.successPage(clientDtoNodes);
+ }
- }*/
- if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));
- // }else if("0".equals(SecurityUtils.getAdministratorIdentity())){
- }else {
- return ResponseUtil.success(clientService.list());
+ public ResponseVO<Object> login(HttpServletRequest request, AdminLoginParam loginParam) {
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, loginParam.getUsername()).last("limit 1"));
+ if (client == null) {
+ return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
+ }
+ String s = RedisUtils.getBean().get(loginParam.getKey());
+ System.out.println(s + "===========================");
+ if (!loginParam.getVlue().equals(s)) {
+ return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
+ }
+ RedisUtils.getBean().delete(loginParam.getKey());
+ if (!passwordEncoder.matches(loginParam.getPassword(), client.getPassword())) {
+ return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
+ 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(",")));
+
+ // 鐢熸垚浠ょ墝
+ String token = tokenProvider.createToken(loginUserInfo);
+
+ // 鏇存柊鏈�鍚庣櫥褰曟椂闂�
+ Client update = new Client();
+ update.setId(client.getId());
+ update.setLoginTime(LocalDateTime.now());
+ clientService.updateById(update);
+
+ // 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
+ Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
+ put("token", properties.getTokenStartWith() + token);
+ put("admin", null);
+ put("client", client);
+ }};
+
+ /**
+ * 鐧诲綍淇℃伅鏃ュ織璁板綍寮�濮�
+ */
+ UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
+ Browser browser = userAgent.getBrowser();
+ OperatingSystem os = userAgent.getOperatingSystem();
+ String content = "鐢ㄦ埛ID锛�" + client.getId()
+ + "锛岀敤鎴峰悕锛�" + client.getClientName()
+ + "锛岀敤鎴风被鍨嬶細绠＄悊鍛�"
+ + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
+ + "锛屾搷浣滅郴缁燂細" + os
+ + "锛屾祻瑙堝櫒锛�" + browser;
+ StoreOperationRecordsUtils.storeOperationLoginData(client.getId(), client.getClientName(), "鐢ㄦ埛鐧诲綍", content);
+ return ResponseUtil.success(authInfo);
+ }
+
+ @AnonymousAccess
+ @GetMapping("/getTokenByKey")
+ public ResponseVO<Object> getLonginKey(@RequestParam(required = false, value = "keyValue") String keyValue) {
+
+ return ResponseUtil.success(clientService.creatKeyByLogin(keyValue));
}
}
--
Gitblit v1.9.3