From 96b35b89e061cc90cd6404fd9941102eedab36ab Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 14 四月 2022 14:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 42c4ce9..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.*;
@@ -223,14 +225,17 @@
@Log("鐢ㄦ埛淇敼澶村儚")
@PostMapping("/updateIcon")
- public ResponseVO<Object> updateIcon(@RequestBody String IconUrl) {
+ 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(), IconUrl);
- }else{
+ result = clientService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
+ } else {
//瓒呯骇绠＄悊鍛樸�佺鐞嗗憳淇敼澶村儚
- result= adminService.updateIcon(SecurityUtils.getUserId(), IconUrl);
+ result = adminService.updateIcon(SecurityUtils.getUserId(), receiveParam.getIconUrl());
}
if (result) {
--
Gitblit v1.9.3