From d3bdb71eea1ddb2c988b084a764b5ef944922c84 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 14 四月 2022 18:14:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 f0fb16b..49b96c0 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
@@ -10,6 +10,7 @@
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;
@@ -23,6 +24,7 @@
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.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.domain.*;
@@ -101,13 +103,14 @@
return ResponseUtil.success(authInfo);
}
+ // @Log("鍚庡彴鐢ㄦ埛淇℃伅")
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
Long userId = SecurityUtils.getUserId();
List<Role> roles;
MapBuilder<Object, Object> builder;
- if (AdministratorEnums.ADMIN.equals(SecurityUtils.getAdministratorIdentity())
- || AdministratorEnums.CUSTOMER.equals(SecurityUtils.getAdministratorIdentity())) {
+ 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);
@@ -129,6 +132,7 @@
return ResponseUtil.success(builder.build());
}
+ @Log("鍚庡彴鐢ㄦ埛鍒楄〃")
@GetMapping(value = "/list")
public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -157,6 +161,7 @@
return ResponseUtil.successPage(adminDtoList);
}
+ @Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@PostMapping("/register")
public ResponseVO<Object> register(@Validated @RequestBody AdminParam param) {
boolean result = adminService.register(param);
@@ -172,6 +177,7 @@
/**
* 淇敼绠＄悊鍛樹俊鎭�
*/
+ @Log("鍚庡彴鐢ㄦ埛淇敼淇℃伅")
@PostMapping("/update/{adminId}")
public ResponseVO<Object> updateAdmin(@RequestBody AdminParam param, @PathVariable Long adminId) {
boolean result = adminService.updateAdmin(adminId, param);
@@ -185,6 +191,7 @@
/**
* 淇敼鎴戠殑瀵嗙爜
*/
+ @Log("鍚庡彴鐢ㄦ埛淇敼瀵嗙爜")
@PutMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
boolean result = adminService.updateMyPassword(param);
@@ -205,6 +212,7 @@
// return ResponseUtil.success(null);
// }
+ @Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
@PostMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
boolean result = adminService.deleteAdmin(adminId);
@@ -215,6 +223,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