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 | 138 ++++++++++++++++++++++++++++++----------------
1 files changed, 90 insertions(+), 48 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 25b432f..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,40 +1,47 @@
package com.sandu.ximon.admin.controller;
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.hutool.extra.servlet.ServletUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.ResponseStatusEnums;
-import com.sandu.common.object.BaseConditionVO;
+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.dto.ClientDto;
+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.ResetClientPasswordPrarm;
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.domain.ClientRoleRelation;
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.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -55,6 +62,9 @@
@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("娣诲姞鎴愬姛");
@@ -66,6 +76,9 @@
@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("鏇存柊鎴愬姛");
@@ -74,18 +87,43 @@
}
}
-// @PostMapping("/resetClientPassword")
-// public ResponseVO<Object> resetClientPassword(@RequestBody @Validated ResetClientPasswordPrarm resetClientPasswordPrarm) {
-// boolean b = clientService.resetPassword(resetClientPasswordPrarm);
-// if (b) {
-// return ResponseUtil.success("淇敼鎴愬姛");
-// } else {
-// return ResponseUtil.fail("淇敼澶辫触");
-// }
-// }
+ /**
+ * 淇敼鏅�氱敤鎴风殑瀵嗙爜
+ */
+ @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) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -95,46 +133,28 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ 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);
- 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 (keyword != null && !keyword.isEmpty()) {
- wrapper.like(Client::getClientName, keyword)
- .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getMobile, keyword))
- .or(clientLambdaQueryWrapper -> clientLambdaQueryWrapper.like(Client::getLinkMan, keyword));
- }
- 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);
+ return ResponseUtil.successPage(clientDtoNodes);
}
- @AnonymousAccess
- @PostMapping(value = "/login")
- public ResponseVO<Object> longin(@RequestBody @Validated AdminLoginParam loginParam) {
+ 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());
}
@@ -160,8 +180,30 @@
// 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
put("token", properties.getTokenStartWith() + token);
- put("user", client);
+ 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