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 | 83 +++++------------------------------------
1 files changed, 11 insertions(+), 72 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 e520e3a..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,22 +1,18 @@
package com.sandu.ximon.admin.controller;
-import cn.hutool.core.bean.BeanUtil;
import cn.hutool.extra.servlet.ServletUtil;
-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.ResponseStatusEnums;
import com.sandu.common.execption.BusinessException;
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;
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.UpdateClientPrarm;
@@ -29,10 +25,8 @@
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 com.sandu.ximon.dao.enums.OrderByEnums;
import eu.bitwalker.useragentutils.Browser;
import eu.bitwalker.useragentutils.OperatingSystem;
import eu.bitwalker.useragentutils.UserAgent;
@@ -44,7 +38,10 @@
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;
/**
@@ -136,77 +133,18 @@
}
@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);
-
- LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
- if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
- wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId()).or(w -> w.eq(
- Client::getId, SecurityUtils.getUserId()
- ));
- }
- if (keyword != null && !keyword.isEmpty()) {
- wrapper.like(Client::getClientName, keyword)
- .or(w1 -> w1.like(Client::getMobile, keyword))
- .or(w2 -> w2.like(Client::getLinkMan, keyword));
- }
- //鎺掑簭瀛楁
- String orderByResult = "id";
- //姝ｅ簭銆佸�掑彊
- String orderBySeq = OrderByEnums.ASC.getCode();
- if (order != null) {
- switch (order) {
- case 1:
- orderByResult = OrderByEnums.CLIENT_CREATE_TIME.getCode();
- break;
- default:
- }
- }
- if (seq != null) {
- switch (seq) {
- case 1:
- orderBySeq = OrderByEnums.ASC.getCode();
- break;
- case 2:
- orderBySeq = OrderByEnums.DESC.getCode();
- break;
- default:
- break;
- }
- }
- //鎺掑簭鏂瑰紡
- String orderBy = orderByResult + " " + orderBySeq;
-
- if (baseConditionVO != null) {
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
- }
- 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(HttpServletRequest request, @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());
@@ -242,7 +180,8 @@
// 杩斿洖 token 涓� 鐢ㄦ埛淇℃伅
Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
put("token", properties.getTokenStartWith() + token);
- put("user", client);
+ put("admin", null);
+ put("client", client);
}};
/**
--
Gitblit v1.9.3