From e15ed2d9563412769d7e7c7d8c9cba200e3700af Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 七月 2022 17:32:00 +0800
Subject: [PATCH] 便捷登录
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 435c95c..5c47824 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,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
import cn.hutool.extra.servlet.ServletUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,6 +29,7 @@
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.Admin;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -157,7 +159,7 @@
.or(w2 -> w2.like(Client::getLinkMan, keyword));
}
//鎺掑簭瀛楁
- String orderByResult = OrderByEnums.CLIENT_CREATE_TIME.getCode();
+ String orderByResult = "id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
@@ -183,7 +185,9 @@
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<Client> clientList = clientService.list(wrapper);
List<ClientDto> clientDtoList = new ArrayList<>();
@@ -258,4 +262,10 @@
StoreOperationRecordsUtils.storeOperationLoginData(client.getId(), client.getClientName(), "鐢ㄦ埛鐧诲綍", content);
return ResponseUtil.success(authInfo);
}
+
+ @GetMapping("/getTokenByKey")
+ public ResponseVO<Object> getLonginKey(@RequestParam(required = false,value = "keyValue") String keyValue) {
+
+ return ResponseUtil.success(clientService.creatKeyByLogin(keyValue));
+ }
}
--
Gitblit v1.9.3