优化添加员工 为cmd 模式

service-api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java

@@ -1,157 +0,0 @@
-package com.java110.api.listener.user;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.user.IUserBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.core.factory.DataFlowFactory;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.user.UserDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
-import com.java110.dto.file.FileDto;
-import com.java110.entity.center.AppService;
-import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.po.file.FileRelPo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.CommonConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.constant.StoreUserRelConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
-
-/**
- * 添加员工 2018年12月6日
- * Created by wuxw on 2018/5/18.
- */
-@Java110Listener("addStaffServiceListener")
-public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
-
-    private final static Logger logger = LoggerFactory.getLogger(AddStaffServiceListener.class);
-
-    @Autowired
-    private IUserBMO userBMOImpl;
-
-    @Autowired
-    private IUserInnerServiceSMO userInnerServiceSMOImpl;
-
-    @Autowired
-    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_USER_STAFF_ADD;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    public int getOrder() {
-        return 0;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-        //获取数据上下文对象
-        Assert.jsonObjectHaveKey(reqJson, "storeId", "请求参数中未包含storeId 节点，请确认");
-        Assert.jsonObjectHaveKey(reqJson, "storeTypeCd", "请求参数中未包含storeTypeCd 节点，请确认");
-        //判断员工手机号是否重复(员工可根据手机号登录平台)
-        UserDto userDto = new UserDto();
-        userDto.setTel(reqJson.getString("tel"));
-        userDto.setUserFlag("1");
-        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
-        Assert.listIsNull(users, "员工手机号不能重复，请重新输入");
-        //判断请求报文中包含 userId 并且 不为-1时 将已有用户添加为员工，反之，则添加用户再将用户添加为员工
-        String userId = "";
-        String oldUserId = "";
-        String relCd = reqJson.getString("relCd");//员工 组织 岗位
-        if (!reqJson.containsKey("userId") || "-1".equals(reqJson.getString("userId"))) {
-            //将userId 强制写成-1
-            oldUserId = "-1";
-            userId = GenerateCodeFactory.getUserId();
-            reqJson.put("userId", userId);
-            //添加用户
-            userBMOImpl.addUser(reqJson, context);
-        }
-        reqJson.put("userId", userId);
-        reqJson.put("relCd", "-1".equals(oldUserId) ? StoreUserRelConstant.REL_COMMON : StoreUserRelConstant.REL_ADMIN);
-        userBMOImpl.addStaff(reqJson, context);
-        //重写 员工岗位
-        reqJson.put("relCd", relCd);
-        userBMOImpl.addStaffOrg(reqJson, context);
-        if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
-            FileDto fileDto = new FileDto();
-            fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
-            fileDto.setFileName(fileDto.getFileId());
-            fileDto.setContext(reqJson.getString("photo"));
-            fileDto.setSuffix("jpeg");
-            fileDto.setCommunityId(reqJson.getString("communityId"));
-            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
-            reqJson.put("photoId", fileDto.getFileId());
-            reqJson.put("fileSaveName", fileName);
-            JSONObject businessUnit = new JSONObject();
-            businessUnit.put("fileRelId", "-1");
-            businessUnit.put("relTypeCd", "12000");
-            businessUnit.put("saveWay", "table");
-            businessUnit.put("objId", userId);
-            businessUnit.put("fileRealName", fileDto.getFileId());
-            businessUnit.put("fileSaveName", fileName);
-            FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
-            super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
-        }
-        commit(context);
-        //如果不成功直接返回
-        if (context.getResponseEntity().getStatusCode() != HttpStatus.OK) {
-            return;
-        }
-    }
-
-    /**
-     * 用户赋权
-     *
-     * @return
-     */
-    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);
-            dataFlowContext.setResponseEntity(responseEntity);
-            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());
-        JSONObject paramInObj = new JSONObject();
-        paramInObj.put("userId", paramObj.getString("userId"));
-        paramInObj.put("storeTypeCd", paramObj.getString("storeTypeCd"));
-        paramInObj.put("storeId", paramObj.getString("storeId"));
-        paramInObj.put("userFlag", "staff");
-        HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj.toJSONString(), header);
-        doRequest(dataFlowContext, appService, httpEntity);
-        responseEntity = dataFlowContext.getResponseEntity();
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            dataFlowContext.setResponseEntity(responseEntity);
-        }
-    }
-}

service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java

@@ -0,0 +1,203 @@
+package com.java110.user.cmd.user;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.file.FileDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
+import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.org.OrgStaffRelPo;
+import com.java110.po.store.StoreUserPo;
+import com.java110.po.user.UserPo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.constant.StoreUserRelConstant;
+import com.java110.utils.constant.UserLevelConstant;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+@Java110Cmd(serviceCode = "user.staff.add")
+public class UserStaffAddCmd extends Cmd {
+
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+    @Autowired
+    private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        //获取数据上下文对象
+        Assert.jsonObjectHaveKey(reqJson, "storeId", "请求参数中未包含storeId 节点，请确认");
+        Assert.jsonObjectHaveKey(reqJson, "storeTypeCd", "请求参数中未包含storeTypeCd 节点，请确认");
+        //判断员工手机号是否重复(员工可根据手机号登录平台)
+        UserDto userDto = new UserDto();
+        userDto.setTel(reqJson.getString("tel"));
+        userDto.setUserFlag("1");
+        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+        Assert.listIsNull(users, "员工手机号不能重复，请重新输入");
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String userId = "";
+        String oldUserId = "";
+        String relCd = reqJson.getString("relCd");//员工 组织 岗位
+        if (!reqJson.containsKey("userId") || "-1".equals(reqJson.getString("userId"))) {
+            //将userId 强制写成-1
+            oldUserId = "-1";
+            userId = GenerateCodeFactory.getUserId();
+            reqJson.put("userId", userId);
+            //添加用户
+            addUser(reqJson);
+        }
+        reqJson.put("userId", userId);
+        reqJson.put("relCd", "-1".equals(oldUserId) ? StoreUserRelConstant.REL_COMMON : StoreUserRelConstant.REL_ADMIN);
+        addStaff(reqJson);
+        //重写 员工岗位
+        reqJson.put("relCd", relCd);
+        addStaffOrg(reqJson);
+        int flag = 0;
+        if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
+            FileDto fileDto = new FileDto();
+            fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+            fileDto.setFileName(fileDto.getFileId());
+            fileDto.setContext(reqJson.getString("photo"));
+            fileDto.setSuffix("jpeg");
+            fileDto.setCommunityId(reqJson.getString("communityId"));
+            String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
+            reqJson.put("photoId", fileDto.getFileId());
+            reqJson.put("fileSaveName", fileName);
+            JSONObject businessUnit = new JSONObject();
+            businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
+            businessUnit.put("relTypeCd", "12000");
+            businessUnit.put("saveWay", "table");
+            businessUnit.put("objId", userId);
+            businessUnit.put("fileRealName", fileDto.getFileId());
+            businessUnit.put("fileSaveName", fileName);
+            FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+            flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+            if(flag <1){
+                throw new CmdException("保存图片异常");
+            }
+        }
+    }
+
+    /**
+     * 添加用户
+     *
+     * @param paramObj
+     */
+    public void addUser(JSONObject paramObj) {
+
+        //校验json 格式中是否包含 name,email,levelCd,tel
+        Assert.jsonObjectHaveKey(paramObj, "name", "请求参数中未包含name 节点，请确认");
+        //Assert.jsonObjectHaveKey(paramObj,"email","请求参数中未包含email 节点，请确认");
+        Assert.jsonObjectHaveKey(paramObj, "tel", "请求参数中未包含tel 节点，请确认");
+        Assert.jsonObjectHaveKey(paramObj, "orgId", "请求报文格式错误或未包含部门信息");
+        Assert.jsonObjectHaveKey(paramObj, "address", "请求报文格式错误或未包含地址信息");
+        Assert.jsonObjectHaveKey(paramObj, "sex", "请求报文格式错误或未包含性别信息");
+        Assert.jsonObjectHaveKey(paramObj, "relCd", "请求报文格式错误或未包含员工角色");
+
+
+        if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
+            Assert.isEmail(paramObj, "email", "不是有效的邮箱格式");
+        }
+
+
+        UserPo userPo = BeanConvertUtil.covertBean(refreshParamIn(paramObj), UserPo.class);
+        int flag = userV1InnerServiceSMOImpl.saveUser(userPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存用户异常");
+        }
+    }
+
+    /**
+     * 对请求报文处理
+     *
+     * @param paramObj
+     * @return
+     */
+    private JSONObject refreshParamIn(JSONObject paramObj) {
+        //paramObj.put("userId","-1");
+        paramObj.put("levelCd", UserLevelConstant.USER_LEVEL_STAFF);
+        //设置默认密码
+        String staffDefaultPassword = MappingCache.getValue(MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
+        Assert.hasLength(staffDefaultPassword, "映射表中未设置员工默认密码，请检查" + MappingConstant.KEY_STAFF_DEFAULT_PASSWORD);
+        staffDefaultPassword = AuthenticationFactory.passwdMd5(staffDefaultPassword);
+        paramObj.put("password", staffDefaultPassword);
+        return paramObj;
+    }
+
+    /**
+     * 添加员工
+     *
+     * @param paramInJson
+     * @return
+     */
+    public void addStaff(JSONObject paramInJson) {
+
+        JSONObject businessStoreUser = new JSONObject();
+        businessStoreUser.put("storeId", paramInJson.getString("storeId"));
+        businessStoreUser.put("storeUserId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_storeUserId));
+        businessStoreUser.put("userId", paramInJson.getString("userId"));
+        businessStoreUser.put("relCd", paramInJson.getString("relCd"));
+
+        StoreUserPo storeUserPo = BeanConvertUtil.covertBean(businessStoreUser, StoreUserPo.class);
+        int flag = storeUserV1InnerServiceSMOImpl.saveStoreUser(storeUserPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存员工 失败");
+        }
+    }
+
+    public void addStaffOrg(JSONObject paramInJson) {
+
+        JSONObject businessOrgStaffRel = new JSONObject();
+        businessOrgStaffRel.put("relId", "-1");
+        businessOrgStaffRel.put("storeId", paramInJson.getString("storeId"));
+        businessOrgStaffRel.put("staffId", paramInJson.getString("userId"));
+        businessOrgStaffRel.put("orgId", paramInJson.getString("orgId"));
+        businessOrgStaffRel.put("relCd", paramInJson.getString("relCd"));
+        OrgStaffRelPo orgStaffRelPo = BeanConvertUtil.covertBean(businessOrgStaffRel, OrgStaffRelPo.class);
+        int flag = orgStaffRelV1InnerServiceSMOImpl.saveOrgStaffRel(orgStaffRelPo);
+        if (flag < 1) {
+            throw new CmdException("保存员工 失败");
+        }
+    }
+}