From 423b61bfb18ceab430303bada28f93631f0e8392 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 12 八月 2022 16:05:17 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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 16c0c59..e520e3a 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.extra.servlet.ServletUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -25,13 +26,13 @@
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.IPUtils;
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;
@@ -135,12 +136,15 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listLikeClient(BaseConditionVO baseConditionVO,
+ @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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
LambdaQueryWrapper<Client> wrapper = Wrappers.lambdaQuery(Client.class);
if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
wrapper.eq(Client::getSuperiorId, SecurityUtils.getUserId()).or(w -> w.eq(
@@ -152,9 +156,39 @@
.or(w1 -> w1.like(Client::getMobile, keyword))
.or(w2 -> w2.like(Client::getLinkMan, keyword));
}
- List<Client> clientList = clientService.list(wrapper);
- List<ClientDto> clientDtoList = new ArrayList<>();
+ //鎺掑簭瀛楁
+ 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);
@@ -178,7 +212,7 @@
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
String s = RedisUtils.getBean().get(loginParam.getKey());
- System.out.println(s+"===========================");
+ System.out.println(s + "===========================");
if (!loginParam.getVlue().equals(s)) {
return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
}
@@ -220,10 +254,17 @@
String content = "鐢ㄦ埛ID锛�" + client.getId()
+ "锛岀敤鎴峰悕锛�" + client.getClientName()
+ "锛岀敤鎴风被鍨嬶細绠＄悊鍛�"
- + "锛岀櫥褰旾P鍦板潃锛�" + IPUtils.getPublicIp()
+ + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
+ "锛屾搷浣滅郴缁燂細" + os
+ "锛屾祻瑙堝櫒锛�" + browser;
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛鐧诲綍", content);
+ 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