From 098357885c9c7124ddad0d14a7fecb5e987d20a7 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 15:22:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/admin/src/main/java/com/doumee/api/business/PushController.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/PushController.java b/server/admin/src/main/java/com/doumee/api/business/PushController.java
index f7a8013..ee9ea49 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PushController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PushController.java
@@ -3,8 +3,9 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.zbom.ZbomIAMService;
-import com.doumee.biz.zbom.model.IamUpateShopModel;
-import com.doumee.biz.zbom.model.IamUpateUserModel;
+import com.doumee.biz.zbom.model.IamUpdateRoleModel;
+import com.doumee.biz.zbom.model.IamUpdateShopModel;
+import com.doumee.biz.zbom.model.IamUpdateUserModel;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
@@ -32,13 +33,13 @@
public ApiResponse<String> updateShopInfo(@RequestHeader(name = "token") String token,
@RequestHeader(name = "uuid") String uuid ,
@RequestHeader(name = "timestamp") String timestamp,
- @RequestBody List<IamUpateShopModel> shopList,
+ @RequestBody List<IamUpdateShopModel> shopList,
HttpServletRequest request ) {
int success = Constants.ZERO;
ApiResponse<String> r = null;
try {
zbomIAMService.updateShopInfo(token,uuid,timestamp,shopList);
- r = ApiResponse.success("鎿嶄綔鎴愬姛");
+ r = ApiResponse.successIam("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
success = Constants.ONE;
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
@@ -47,7 +48,7 @@
success = Constants.ONE;
r = ApiResponse.failed("鎿嶄綔澶辫触");
}finally {
- zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, shopList,success, JSONObject.toJSONString(r));
+ zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo",Constants.ONE,"IAM鎺ㄩ�佺粍缁囦俊鎭�", token, uuid, timestamp, shopList,success, JSONObject.toJSONString(r));
}
return r;
}
@@ -56,13 +57,13 @@
public ApiResponse<String> updateUserInfo(@RequestHeader(name = "token") String token,
@RequestHeader(name = "uuid") String uuid ,
@RequestHeader(name = "timestamp") String timestamp,
- @RequestBody IamUpateUserModel upateUserModel,
+ @RequestBody IamUpdateUserModel upateUserModel,
HttpServletRequest request) {
int success = Constants.ZERO;
ApiResponse<String> r = null;
try {
zbomIAMService.updateUserInfo(token,uuid,timestamp,upateUserModel);
- r = ApiResponse.success("鎿嶄綔鎴愬姛");
+ r = ApiResponse.successIam("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
success = Constants.ONE;
r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
@@ -71,7 +72,31 @@
e.getMessage();
r = ApiResponse.failed("鎿嶄綔澶辫触");
}finally {
- zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo","IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
+ zbomIAMService.saveInterfaceLog("/push/iam/updateUserInfo",Constants.ONE,"IAM鎺ㄩ�佷汉鍛樿处鍙蜂俊鎭�", token, uuid, timestamp, upateUserModel,success, JSONObject.toJSONString(r));
+ }
+ return r;
+ }
+ @ApiOperation("瑙掕壊淇℃伅鏇存柊鎺ㄩ��")
+ @PostMapping("/iam/updateRoleInfo")
+ public ApiResponse<String> updateRoleInfo(@RequestHeader(name = "token") String token,
+ @RequestHeader(name = "uuid") String uuid ,
+ @RequestHeader(name = "timestamp") String timestamp,
+ @RequestBody IamUpdateRoleModel upateModel,
+ HttpServletRequest request) {
+ int success = Constants.ZERO;
+ ApiResponse<String> r = null;
+ try {
+ zbomIAMService.updateRoleInfo(token,uuid,timestamp,upateModel);
+ r = ApiResponse.successIam("鎿嶄綔鎴愬姛");
+ }catch (BusinessException e){
+ success = Constants.ONE;
+ r = ApiResponse.failed(StringUtils.defaultString(e.getMessage(),"鎿嶄綔澶辫触"));
+ }catch (Exception e){
+ success = Constants.ONE;
+ e.getMessage();
+ r = ApiResponse.failed("鎿嶄綔澶辫触");
+ }finally {
+ zbomIAMService.saveInterfaceLog("/push/iam/updateRoleInfo",Constants.ONE,"IAM鎺ㄩ�佽鑹茶处鍙蜂俊鎭�", token, uuid, timestamp, upateModel,success, JSONObject.toJSONString(r));
}
return r;
}
--
Gitblit v1.9.3