优化员工岗位

Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java

@@ -25,7 +25,7 @@ import org.springframework.http.*;
  * 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 @@ public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
     /**
      * 添加员工信息
      *
-     *
-     *
      * @param event
      */
     @Override
@@ -63,43 +61,47 @@ public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
         DataFlowContext dataFlowContext = event.getDataFlowContext();
         AppService service = event.getAppService();
         String paramIn = dataFlowContext.getReqData();
-        Assert.isJsonObject(paramIn,"添加员工时请求参数有误，不是有效的json格式 "+paramIn);
+        Assert.isJsonObject(paramIn, "添加员工时请求参数有误，不是有效的json格式 " + 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"))) {
             //将userId 强制写成-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 @@ public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
         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);
         }
     }