From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 0634fe4..f0fb16b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
@@ -17,18 +18,14 @@
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.AdminDto;
+import com.sandu.ximon.admin.dto.ClientDto;
import com.sandu.ximon.admin.param.AdminLoginParam;
import com.sandu.ximon.admin.param.AdminParam;
import com.sandu.ximon.admin.param.PwdParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.AdminService;
-import com.sandu.ximon.admin.service.ClientService;
-import com.sandu.ximon.admin.service.MenuService;
-import com.sandu.ximon.admin.service.RoleService;
-import com.sandu.ximon.dao.domain.Admin;
-import com.sandu.ximon.dao.domain.Client;
-import com.sandu.ximon.dao.domain.Menu;
-import com.sandu.ximon.dao.domain.Role;
+import com.sandu.ximon.admin.service.*;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -38,10 +35,7 @@
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -62,6 +56,7 @@
private final ClientService clientService;
private final RoleService roleService;
private final TokenProvider tokenProvider;
+ private final AdminRoleRelationService adminRoleRelationService;
@Log("鍚庡彴鐢ㄦ埛鐧诲綍")
@AnonymousAccess
@@ -145,7 +140,21 @@
});
}
List<Admin> list = adminService.list(wrapper);
- return ResponseUtil.successPage(list);
+
+ List<AdminDto> adminDtoList = new ArrayList<>();
+ for (Admin demo : list) {
+ AdminDto adminDto = new AdminDto();
+ BeanUtil.copyProperties(demo, adminDto);
+ AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
+ .eq(AdminRoleRelation::getAdminId, demo.getId()));
+
+ if (one != null) {
+ adminDto.setRoleId(one.getRoleId());
+ }
+ adminDtoList.add(adminDto);
+
+ }
+ return ResponseUtil.successPage(adminDtoList);
}
@PostMapping("/register")
--
Gitblit v1.9.3