From 2f3d783999935f06228705e75fac26ebf099bf87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 18:02:14 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 90 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 15 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 895f405..be50dac 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;
@@ -9,6 +10,8 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
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;
@@ -16,17 +19,18 @@
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.param.ReceiveParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.service.AdminService;
-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.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 com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.GrantedAuthority;
@@ -35,10 +39,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;
/**
@@ -56,10 +57,13 @@
private final MenuService menuService;
private final PasswordEncoder passwordEncoder;
private final AdminService adminService;
+ private final ClientService clientService;
private final RoleService roleService;
private final TokenProvider tokenProvider;
+ private final AdminRoleRelationService adminRoleRelationService;
+ private PermissionConfig permissionConfig;
-
+ @Log("鍚庡彴鐢ㄦ埛鐧诲綍")
@AnonymousAccess
@PostMapping(value = "/login")
public ResponseVO<Object> login(@RequestBody AdminLoginParam loginParam) {
@@ -102,16 +106,28 @@
return ResponseUtil.success(authInfo);
}
+ // @Log("鍚庡彴鐢ㄦ埛淇℃伅")
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
Long userId = SecurityUtils.getUserId();
- Admin admin = adminService.getById(userId);
- List<Role> roles = roleService.listByAdminId(admin.getId());
+ List<Role> roles;
+ MapBuilder<Object, Object> builder;
+ if (AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getAdministratorIdentity())
+ || AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ Admin admin = adminService.getById(userId);
+ roles = roleService.listByAdminId(admin.getId());
+ builder = MapUtil.builder().put("admin", admin);
+
+ } else {
+ Client client = clientService.getById(userId);
+ roles = roleService.listByClientId(client.getId());
+ builder = MapUtil.builder().put("admin", client);
+
+ }
if (CollectionUtil.isEmpty(roles)) {
return ResponseUtil.fail("鐢ㄦ埛娌℃湁瑙掕壊锛屾棤娉曡幏鍙栨暟鎹�");
}
List<Menu> menus = menuService.listByRoleIds(roles.stream().map(Role::getId).collect(Collectors.toList()));
- MapBuilder<Object, Object> builder = MapUtil.builder().put("admin", admin);
if (CollectionUtil.isNotEmpty(menus)) {
List<Menu> collect = menus.stream().filter(menu -> menu.getType() == 0 || menu.getType() == 1).collect(Collectors.toList());
builder.put("menus", collect);
@@ -119,8 +135,12 @@
return ResponseUtil.success(builder.build());
}
+ @Log("鍚庡彴鐢ㄦ埛鍒楄〃")
@GetMapping(value = "/list")
public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
if (keyword != null) {
@@ -130,9 +150,24 @@
});
}
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);
}
+ @Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@PostMapping("/register")
public ResponseVO<Object> register(@Validated @RequestBody AdminParam param) {
boolean result = adminService.register(param);
@@ -148,6 +183,7 @@
/**
* 淇敼绠＄悊鍛樹俊鎭�
*/
+ @Log("鍚庡彴鐢ㄦ埛淇敼淇℃伅")
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
boolean result = adminService.updateAdmin(adminId, param);
@@ -161,6 +197,7 @@
/**
* 淇敼鎴戠殑瀵嗙爜
*/
+ @Log("鍚庡彴鐢ㄦ埛淇敼瀵嗙爜")
@PutMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
boolean result = adminService.updateMyPassword(param);
@@ -181,6 +218,7 @@
// return ResponseUtil.success(null);
// }
+ @Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
@PostMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
boolean result = adminService.deleteAdmin(adminId);
@@ -191,6 +229,28 @@
}
}
+ @Log("鐢ㄦ埛淇敼澶村儚")
+ @PostMapping("/updateIcon")
+ public ResponseVO<Object> updateIcon(@RequestBody ReceiveParam receiveParam) {
+ if (receiveParam.getIconUrl().trim() == null) {
+ throw new BusinessException("澶村儚URL涓嶈兘涓虹┖锛�");
+ }
+ boolean result;
+ //鏅�氱敤鎴蜂慨鏀瑰ご鍍�
+ if (SecurityUtils.getAdministratorIdentity().equals(AdministratorEnums.NORMAL.getCode())) {
+ result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
+ } else {
+ //瓒呯骇绠＄悊鍛樸�佺鐞嗗憳淇敼澶村儚
+ result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
+ }
+
+ if (result) {
+ return ResponseUtil.success("淇敼鎴愬姛");
+ } else {
+ return ResponseUtil.fail("淇敼澶辫触");
+ }
+ }
+
// /**
// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
// *
--
Gitblit v1.9.3