Browse Source

政府服务平台-用户信息获取(多个机构)

zdm 6 years ago
parent
commit
21634caa45

+ 34 - 3
src/main/java/com.yihu.ehr/basic/user/controller/UserEndPoint.java

@ -13,6 +13,7 @@ import com.yihu.ehr.basic.user.entity.Roles;
import com.yihu.ehr.basic.user.entity.UserTypeRoles;
import com.yihu.ehr.basic.user.service.RoleUserService;
import com.yihu.ehr.basic.user.service.RolesService;
import com.yihu.ehr.commons.constants.BasicServiceApi;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.basic.user.entity.Doctors;
import com.yihu.ehr.basic.user.entity.User;
@ -235,15 +236,13 @@ public class UserEndPoint extends EnvelopRestEndPoint {
    public MUser getUserByLoginCode(
            @ApiParam(name = "user_name", value = "登录账号", defaultValue = "")
            @PathVariable(value = "user_name") String userName) {
        //User user = userManager.getUserByUserName(userName);
        //TODO 可根据帐户,手机号,身份证号登陆接口新增
        // 帐户:手机号,身份证号,登录账号
        List<User> users = userService.getUserForLogin(userName);
        if (users != null) {
            if (users.size() == 1) {
                MUser mUser = new MUser();
                List<OrgMemberRelation> memberRelations = orgMemberRelationService.findByField("userId", users.get(0).getId());
                mUser = convertToModel(users.get(0), MUser.class);
                mUser = convertToModel(users.get(0), MUser.class);
                if (memberRelations != null && memberRelations.size() > 0) {
                    mUser.setPosition(memberRelations.get(0).getDutyName());
                    mUser.setDepartment(memberRelations.get(0).getDeptName());
@ -1134,4 +1133,36 @@ public class UserEndPoint extends EnvelopRestEndPoint {
        return envelop;
    }
    @RequestMapping(value = BasicServiceApi.Users.GetUserByLoginCode, method = RequestMethod.GET)
    @ApiOperation(value = "政府服务平台-根据登录账号获取当前用户", notes = "政府服务平台-根据登陆用户名及密码验证用户(一个人可属于多个机构)")
    public Envelop getUserInfoByLoginCode(
            @ApiParam(name = "userName", value = "登录账号", defaultValue = "")
            @PathVariable(value = "userName") String userName) {
        Envelop envelop=new Envelop();
        try {
            // 帐户:手机号,身份证号,登录账号
            List<User> users = userService.getUserForLogin(userName);
            envelop.setObj(users);
            if (users != null) {
                if (users.size() == 1) {
                    List<OrgMemberRelation> memberRelations = orgMemberRelationService.findByField("userId", users.get(0).getId());
                    envelop.setSuccessFlg(true);
                    envelop.setDetailModelList(memberRelations);
                }else {
                    envelop.setSuccessFlg(false);
                    envelop.setErrorMsg("账号重复,请联系管理员!");
                }
            }else {
                envelop.setSuccessFlg(false);
                envelop.setErrorMsg("该账号不存在,请确认或联系管理员!");
            }
        } catch (Exception e) {
            envelop.setSuccessFlg(false);
            envelop.setErrorMsg(e.getMessage());
            e.printStackTrace();
        }
        return envelop;
    }
}

+ 60 - 0
src/main/java/com.yihu.ehr/commons/constants/BasicServiceApi.java

@ -0,0 +1,60 @@
package com.yihu.ehr.commons.constants;
/**
 * 微服务REST API. 此处定义的URL可用于服务对外提供的地址及HTTP客户端请求地址.
 * URL定义遵循健康档案平台REST规范.
 *
 * @author zdm
 * @version 1.0
 * @created 2018.09.05 15:04
 */
public class BasicServiceApi {
    public static class Users {
        //存在于私有库-start
        public static final String Users = "/users";
        public static final String UsersOfApp = "/usersOfApp";
        public static final String User = "/users/{user_name}";
        public static final String UserExistence = "/users/{user_name}/existence";
        public static final String UserVerification = "/users/verification";
        public static final String UserAdmin = "/users/admin/{user_id}";
        public static final String UserAdminPassword = "/users/admin/{user_id}/password";
        public static final String UserAdminPasswordReset = "/users/admin/{user_id}/password_reset";
        public static final String UserAdminKey = "/users/admin/{user_id}/key";
        public static final String UserAdminContact = "/users/admin/{user_id}/contact";
        public static final String UserIdCardNoExistence = "/user/id_card_no/existence";
        public static final String UserEmailNoExistence = "/user/email/existence";
        public static final String UserTelephoneNoExistence = "/user/telephone/existence";
        public static final String UserPhoneExistence = "/user/phone/existence";
        public static final String UserOnePhoneExistence = "/user/onePhone/existence";
        public static final String UserEmailExistence = "/user/email/existence";
        public static final String UseridCardNoExistence = "/user/idCardNo/existence";
        public static final String UserByIdCardNo = "/user/idCardNo/userByIdCardNo";
        public static final String UpdateSystemUser = "/updateSystemUser";
        public static final String GetOrgAndDeptRelation = "/users/getOrgAndDeptRelation";
        public static final String InitializeSystemUser = "/users/initialize";
        public static final String UsersByTel = "/users/tel";
        public static final String H5Handshake = "/users/h5/handshake";
        public static final String UsersOfAppPhoneExistence = "/usersOfApp/user/onePhone/existence";
        public static final String GetUserOfUsersOfApp = "/usersOfApp/users/getUserOfUsersOfApp";
        public static final String GetUserInfoAndRolesByUserIdOrCode = "/users/orgDeptMember/getUserInfoAndRolesByUserIdOrCode";
        public static final String Save = "/users/save";
        public static final String Update = "/users/update";
        public static final String Check = "/users/check";
        public static final String ChangePassword = "/users/changePassword";
        public static final String DistributeSecurityKey = "/users/distributeSecurityKey";
        public static final String GetSecurityKey = "/users/getSecurityKey";
        public static final String changePasswordByTelephone = "/usersOfApp/users/changePasswordByTelephone";
        public static final String changePasswordByOldPassword = "/users/changePasswordByOldPassword";
        public static final String updateUserTelePhone = "/users/updateTelephone";
        public static final String initializationAuthorization = "/users/initializationAuthorization";
        //存在于私有库-end
        //basic服务拆分之后追加
        public static final String GetUserByLoginCode = "/users/GetUserByLoginCode/{userName}";
    }
}