From e17ad643f4db10fbd01d3f9222039854cd514e9f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 08 五月 2020 00:36:31 +0800
Subject: [PATCH] 优化员工岗位
---
Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java b/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java
index 2551cb3..f0f1ec4 100644
--- a/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java
+++ b/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java
@@ -25,7 +25,7 @@
* Created by wuxw on 2018/5/18.
*/
@Java110Listener("addStaffServiceListener")
-public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
+public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener {
private final static Logger logger = LoggerFactory.getLogger(AddStaffServiceListener.class);
@@ -53,8 +53,6 @@
/**
* 娣诲姞鍛樺伐淇℃伅
*
- *
- *
* @param event
*/
@Override
@@ -63,43 +61,47 @@
DataFlowContext dataFlowContext = event.getDataFlowContext();
AppService service = event.getAppService();
String paramIn = dataFlowContext.getReqData();
- Assert.isJsonObject(paramIn,"娣诲姞鍛樺伐鏃惰姹傚弬鏁版湁璇紝涓嶆槸鏈夋晥鐨刯son鏍煎紡 "+paramIn);
+ Assert.isJsonObject(paramIn, "娣诲姞鍛樺伐鏃惰姹傚弬鏁版湁璇紝涓嶆槸鏈夋晥鐨刯son鏍煎紡 " + paramIn);
JSONObject paramInJson = JSONObject.parseObject(paramIn);
- Assert.jsonObjectHaveKey(paramInJson,"storeId","璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(paramInJson,"storeTypeCd","璇锋眰鍙傛暟涓湭鍖呭惈storeTypeCd 鑺傜偣锛岃纭");
+ Assert.jsonObjectHaveKey(paramInJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
+ Assert.jsonObjectHaveKey(paramInJson, "storeTypeCd", "璇锋眰鍙傛暟涓湭鍖呭惈storeTypeCd 鑺傜偣锛岃纭");
JSONArray businesses = new JSONArray();
//鍒ゆ柇璇锋眰鎶ユ枃涓寘鍚� userId 骞朵笖 涓嶄负-1鏃� 灏嗗凡鏈夌敤鎴锋坊鍔犱负鍛樺伐锛屽弽涔嬶紝鍒欐坊鍔犵敤鎴峰啀灏嗙敤鎴锋坊鍔犱负鍛樺伐
String userId = "";
String oldUserId = "";
- if(!paramInJson.containsKey("userId") || "-1".equals(paramInJson.getString("userId"))){
+ String relCd = paramInJson.getString("relCd");//鍛樺伐 缁勭粐 宀椾綅
+
+ if (!paramInJson.containsKey("userId") || "-1".equals(paramInJson.getString("userId"))) {
//灏唘serId 寮哄埗鍐欐垚-1
oldUserId = "-1";
userId = GenerateCodeFactory.getUserId();
- paramInJson.put("userId",userId);
+ paramInJson.put("userId", userId);
//娣诲姞鐢ㄦ埛
- JSONObject business = userBMOImpl.addUser(paramInJson,dataFlowContext);
+ JSONObject business = userBMOImpl.addUser(paramInJson, dataFlowContext);
businesses.add(business);
}
- paramInJson.put("userId",userId);
- paramInJson.put("relCd","-1".equals(oldUserId)?StoreUserRelConstant.REL_COMMON:StoreUserRelConstant.REL_ADMIN);
+ paramInJson.put("userId", userId);
+ paramInJson.put("relCd", "-1".equals(oldUserId) ? StoreUserRelConstant.REL_COMMON : StoreUserRelConstant.REL_ADMIN);
JSONObject staffBusiness = userBMOImpl.addStaff(paramInJson);
businesses.add(staffBusiness);
+ //閲嶅啓 鍛樺伐宀椾綅
+ paramInJson.put("relCd", relCd);
JSONObject staffOrgBusiness = userBMOImpl.addStaffOrg(paramInJson);
businesses.add(staffOrgBusiness);
HttpHeaders header = new HttpHeaders();
- dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID,userId);
- dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD,"D");
+ dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_USER_ID, userId);
+ dataFlowContext.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
- String paramInObj = userBMOImpl.restToCenterProtocol(businesses,dataFlowContext.getRequestCurrentHeaders()).toJSONString();
+ String paramInObj = userBMOImpl.restToCenterProtocol(businesses, dataFlowContext.getRequestCurrentHeaders()).toJSONString();
//灏� rest header 淇℃伅浼犻�掑埌涓嬪眰鏈嶅姟涓幓
- userBMOImpl.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+ userBMOImpl.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj, header);
//http://user-service/test/sayHello
@@ -108,39 +110,40 @@
super.doResponse(dataFlowContext);
//濡傛灉涓嶆垚鍔熺洿鎺ヨ繑鍥�
- if(dataFlowContext.getResponseEntity().getStatusCode() != HttpStatus.OK){
- return ;
+ if (dataFlowContext.getResponseEntity().getStatusCode() != HttpStatus.OK) {
+ return;
}
//璧嬫潈
- privilegeUserDefault(dataFlowContext,paramInJson);
+ privilegeUserDefault(dataFlowContext, paramInJson);
}
/**
* 鐢ㄦ埛璧嬫潈
+ *
* @return
*/
- private void privilegeUserDefault(DataFlowContext dataFlowContext,JSONObject paramObj){
- ResponseEntity responseEntity= null;
+ private void privilegeUserDefault(DataFlowContext dataFlowContext, JSONObject paramObj) {
+ ResponseEntity responseEntity = null;
AppService appService = DataFlowFactory.getService(dataFlowContext.getAppId(), ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE);
- if(appService == null){
- responseEntity = new ResponseEntity<String>("褰撳墠娌℃湁鏉冮檺璁块棶"+ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE,HttpStatus.UNAUTHORIZED);
+ if (appService == null) {
+ responseEntity = new ResponseEntity<String>("褰撳墠娌℃湁鏉冮檺璁块棶" + ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE, HttpStatus.UNAUTHORIZED);
dataFlowContext.setResponseEntity(responseEntity);
- return ;
+ return;
}
String requestUrl = appService.getUrl();
HttpHeaders header = new HttpHeaders();
- header.add(CommonConstant.HTTP_SERVICE.toLowerCase(),ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE);
- userBMOImpl.freshHttpHeader(header,dataFlowContext.getRequestCurrentHeaders());
+ header.add(CommonConstant.HTTP_SERVICE.toLowerCase(), ServiceCodeConstant.SERVICE_CODE_SAVE_USER_DEFAULT_PRIVILEGE);
+ userBMOImpl.freshHttpHeader(header, dataFlowContext.getRequestCurrentHeaders());
JSONObject paramInObj = new JSONObject();
- paramInObj.put("userId",paramObj.getString("userId"));
- paramInObj.put("storeTypeCd",paramObj.getString("storeTypeCd"));
- paramInObj.put("userFlag","staff");
+ paramInObj.put("userId", paramObj.getString("userId"));
+ paramInObj.put("storeTypeCd", paramObj.getString("storeTypeCd"));
+ paramInObj.put("userFlag", "staff");
HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj.toJSONString(), header);
- doRequest(dataFlowContext,appService,httpEntity);
+ doRequest(dataFlowContext, appService, httpEntity);
responseEntity = dataFlowContext.getResponseEntity();
- if(responseEntity.getStatusCode() != HttpStatus.OK){
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
dataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0