From 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 09 九月 2022 11:34:13 +0800
Subject: [PATCH] 灯杆解绑fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 81 +++++++---------------------------------
1 files changed, 15 insertions(+), 66 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 d88f1b3..3973ce4 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,70 +133,15 @@
}
@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;
-
- 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
@@ -258,4 +200,11 @@
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