人才招聘功能更新， 增加弹出提示框

src/main/java/com/uas/platform/home/controller/UuzcController.java

@@ -11,7 +11,6 @@ import com.uas.platform.home.model.ResultInfo;
 import com.uas.platform.home.model.UuzcUserInfo;
 import com.uas.platform.home.web.BaseController;
 import com.uas.sso.SSOHelper;
-import com.uas.sso.common.util.HttpUtil;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -43,53 +42,24 @@ public class UuzcController extends BaseController {
                 map.put("ishr", true);
                 map.put("user", info);
                 map.put("usertype", "hr");
-            } else {
-                //先判断个人账户类型
-                String personalUrl = "http://job.uuzcc.com/index.php?m=&c=ubtob&a=check_user&uc_uid=" + user.getDialectUID();
-                HttpUtil.ResponseWrap responseWrap =  HttpUtil.doGet(personalUrl);
-                if(responseWrap.isSuccess()) {
-                    ResultInfo userInfo = JSONObject.parseObject(responseWrap.getContent(), ResultInfo.class);
-                    if(null != userInfo.getData()) {
-                        if(userInfo.getData().getCode().equals("2")) {//个人用户
-                            UuzcUserInfo info = getUserInfo(user, false);
-                            JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
-                            map.put("user", formData);
-                            map.put("usertype", "personal");
-                            return  map;
-                        } else if(userInfo.getData().getCode().equals("1")) {// 企业用户
-                            UuzcUserInfo info = getUserInfo(user, true);
-                            //判断是否设置了hr
-                            String result = AccountUtils.getHrAccount(info.getLicense());
-                            ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
-                            map.put("hr", resInfo.getExistHr() ? true : false);
-                            if(user.getName().equals(user.getUserSpaceDetail().getAdminName())) {
-                                map.put("manager", true);
-                            } else {
-                                map.put("managerName", user.getUserSpaceDetail().getAdminName());
-                            }
-                            map.put("user", info);
-                            map.put("usertype", "company");
-                        } else if(userInfo.getData().getCode().equals("0")) {// 如果是未注册信息，直接调用后面登录接口注册，在这个地方先判断
-                            if(null == SystemSession.getUser().getUserSpaceDetail()) {// 个人用户
-                                UuzcUserInfo info = getUserInfo(user, false);
-                                JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
-                                map.put("user", formData);
-                                map.put("usertype", "personal");
-                            } else {// 企业用户
-                                UuzcUserInfo info = getUserInfo(user, true);
-                                map.put("user", info);
-                                map.put("usertype", "company");
-                                if(user.getName().equals(user.getUserSpaceDetail().getAdminName())) {
-                                    map.put("manager", true);
-                                } else {
-                                    map.put("managerName", user.getUserSpaceDetail().getAdminName());
-                                }
-                            }
-                        }
-                    }
+            } else if(null != user.getUserSpaceDetail()) {// 先通过登录的信息判断是否是企业用户
+                map.put("usertype", "company");
+                UuzcUserInfo info = getUserInfo(user, true);
+                //判断是否设置了hr
+                String result = AccountUtils.getHrAccount(info.getLicense());
+                ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
+                map.put("hr", resInfo.getExistHr() ? true : false);
+                if(user.getName().equals(user.getUserSpaceDetail().getAdminName())) {
+                    map.put("manager", true);
                 } else {
-                    map.put("info", "信息验证失败");
+                    map.put("managerName", user.getUserSpaceDetail().getAdminName());
                 }
+                map.put("user", info);
+            } else if(null == user.getUserSpaceDetail()) {// 个人用户
+                UuzcUserInfo info = getUserInfo(user, false);
+                JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
+                map.put("user", formData);
+                map.put("usertype", "personal");
             }
         } else {
             SSOHelper.clearLogin(request, response);

src/main/webapp/resources/css/toastr.css

@@ -5,6 +5,7 @@
   -ms-word-wrap: break-word;
   word-wrap: break-word;
 }
+
 .toast-message a,
 .toast-message label {
   color: #ffffff;
@@ -86,7 +87,7 @@ button.toast-close-button {
     margin: 0 auto;
     text-align: center;
     position: fixed;
-    top: 20px ;
+    top: 20% ;
     left: 50%;
     margin-left: -10%;
     z-index: 999999;
@@ -104,6 +105,7 @@ button.toast-close-button {
   margin: 0 0 6px;
   padding: 15px 15px 15px 50px;
   width: 300px;
+  /*height: 70px;*/
   -moz-border-radius: 3px 3px 3px 3px;
   -webkit-border-radius: 3px 3px 3px 3px;
   border-radius: 3px 3px 3px 3px;

src/main/webapp/resources/js/common/common.js

@@ -92,14 +92,17 @@ function jobUuzc() {
     var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
     $.get('uuzc/account/check', function(data) {
         var user = data.user;
-        if(data.usertype == 'company' && !data.ishr) {// 如果是企业账号并且未设置hr账号，停留在当前页，其他的都跳转到人才招聘页
+        if(data.usertype == 'hr') { // 账号类型是hr直接登录
+            loginJobUuzc(user, loginUrl, 'hr');
+            setTimeout(window.location.href = url, 200);
+        } else if(data.usertype == 'company' && !data.ishr) {// 如果是企业账号并且未设置hr账号，停留在当前页，其他的都跳转到人才招聘页
             if(data.hr) {// 如果企业存在hr账号，直接跳转
                 loginJobUuzc(user, loginUrl, data.usertype);
                 setTimeout(window.location.href = url, 200);
             } else {
                 return;
             }
-        } else if(null != data && null != data.usertype) {
+        } else if(data.usertype == 'personal') {
             loginJobUuzc(user, loginUrl, data.usertype);
             setTimeout(window.location.href = url, 200);
         } else {
@@ -115,12 +118,9 @@ function jobUuzcGet() {
     var url = 'http://job.uuzcc.com/';
     var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
     $.get('uuzc/account/check', function(data) {
-        if(data.info) {
-            toastr.error(data.info);
-        }
         var user = data.user;
         if(null != data && 'personal' == data.usertype) {
-            toastr.info("您的账号为个人账号，不可进行此操作");
+            toastr.error("您的账号为个人账号，不可进行此操作");
         } else if(null != data && 'company' == data.usertype) {
             if(data.ishr) {//如果是hr直接登录
                 loginJobUuzc(user, loginUrl, 'company');
@@ -130,10 +130,10 @@ function jobUuzcGet() {
                     if(data.manager) {// 管理员停留设置hr
                         window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
                     } else {
-                        toastr.info('请通知管理员' + data.managerName + '设置HR账号');
+                        toastr.error('请通知管理员' + data.managerName + '设置HR账号');
                     }
                 } else {// 如果企业存在hr
-                    toastr.info('您的账号非HR账号，不可进行此操作');
+                    toastr.error('您的账号非HR账号，不可进行此操作');
                 }
             }
         } else {
@@ -149,17 +149,15 @@ function jobUuzcPost() {
     var url = 'http://job.uuzcc.com/';
     var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
     $.get('uuzc/account/check', function(data) {
-        if(data.ishr) {
-            toastr.info('您的账号为HR账号，不能进行此操作');
-            return;
-        }
-        if(data.info) {
-            toastr.info(data.info);
-        }
-        var user = data.user;
-        if(null != data && null != data.usertype) {
-            loginJobUuzc(user, loginUrl, data.usertype);
-            setTimeout(window.location.href = url, 200);
+        if(null != data.usertype) {
+            var user = data.user;
+            if(data.usertype == 'hr') {
+                toastr.error('您的账号为HR账号，不能进行此操作');
+                return;
+            } else {
+                loginJobUuzc(user, loginUrl, data.usertype);
+                setTimeout(window.location.href = url, 200);
+            }
         } else {// 求职时可以未登录
             data.content && (window.location.href = url);
         }
@@ -208,18 +206,18 @@ function addHrAccount() {
                var result = data.result;
                if(result == 'success') {
                    toastr.success('设置HR账号成功');
-                   setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 200);
+                   setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 500);
                }
                if(result == 'exist') {
-                   toastr.info('该企业HR账号已存在');
+                   toastr.error('该企业HR账号已存在');
                }
                if(result == 'setFailure') {
-                   toastr.error('设置HR账号失败');
+                   toastr.erroror('设置HR账号失败');
                }
            }
         },
         error: function (error) {
-            toastr.error(error);
+            toastr.erroror(error);
         }
     });
 }
@@ -244,18 +242,18 @@ function setHrAccount() {
                 var result = data.result;
                 if(result == 'success') {
                     toastr.success('设置HR账号成功');
-                    setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 200);
+                    setTimeout(window.location.href = 'http://www.ubtob.com/#/uuzcJob', 500);
                 }
                 if(result == 'exist') {
-                    toastr.info('该企业HR账号已存在');
+                    toastr.error('该企业HR账号已存在');
                 }
                 if(result == 'setFailure') {
-                    toastr.error('设置HR账号失败');
+                    toastr.erroror('设置HR账号失败');
                 }
             }
         },
         error: function (error) {
-            toastr.error(error);
+            toastr.erroror(error);
         }
     });
 }