update:更新统一认证，单点到erp接口以及统一用户接口

src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java

@@ -3956,6 +3956,7 @@ public class CollaborationController extends BaseController {
         JSONObject jsonObject = new JSONObject();
         String decodeRs = null ;
         String code = request.getParameter("code");
+        modelAndView.addObject("code", code);
         String filePath = SystemEnvironment.getApplicationFolder() + File.separator + "fkmap" + File.separator + "url.properties" ;
         InputStream in = new BufferedInputStream(new FileInputStream(filePath));
         Properties p = new Properties();
@@ -4016,6 +4017,7 @@ public class CollaborationController extends BaseController {
         }
         String getTicketUrl = p.getProperty("getTicketUrl");
         String map = "";
+        LOG.info("当前登录人："+user.getLoginName());
         if (code.equals("erp")) {
             //如果存在erp权限，则获取token
             map = getTicket(getTicketUrl, erpAppCode, user.getLoginName());
@@ -4030,13 +4032,13 @@ public class CollaborationController extends BaseController {
         String token = "";
         if(jsonObject.get("status").equals("0")){
             token = (String) jsonObject.get("token");
+            LOG.info("token:"+token);
         }else {
             LOG.error(jsonObject.get("errorMsg"));
             return modelAndView;
         }
 //		String token = (String) map.get("token");
         modelAndView.addObject("token", token);
-        modelAndView.addObject("code", code);
         return modelAndView;
     }
 
@@ -4064,6 +4066,7 @@ public class CollaborationController extends BaseController {
         }
         if(jsonObject.get("status").equals("0")){
             code = (String) jsonObject.get("userAuthorizedApps");
+            LOG.info("userAuthorizedApps："+code);
         }else {
             LOG.error(jsonObject.get("errorMsg"));
         }

src/main/java/com/seeyon/apps/thirdparyServlet/ThirdparyServlet.java

@@ -418,7 +418,15 @@ public class ThirdparyServlet extends HttpServlet {
             returnMap.put("errormsg","必填属性未填");
             return;
         }
-        Long accId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
+        List<V3xOrgDepartment> departments = orgManagerDirect.getAllDepartments(null,null,true,null,null,null);
+        Long accId = -1L;
+        for (V3xOrgDepartment department : departments) {
+            if (department.getCode().equals((String) baseInfo.get("deptUniCode"))) {
+                accId = department.getId();
+                break;
+            }
+        }
+//        Long accId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
         V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(accId);
 //        V3xOrgAccount account = orgManager.getAccountByName((String) baseInfo.get("deptName"));
         if (orgDepartment != null){
@@ -432,7 +440,14 @@ public class ThirdparyServlet extends HttpServlet {
         department.setName((String) baseInfo.get("deptName"));
         department.setCode((String) baseInfo.get("deptUniCode"));
         if (parentInfo.get("isCorp").equals("0")){
-            Long departmentId = departmentManager.getDepartmentIdByCode((String) parentInfo.get("parentCode"));
+            Long departmentId = -1L;
+            for (V3xOrgDepartment department1 : departments) {
+                if (department1.getCode().equals((String) parentInfo.get("parentCode"))) {
+                    departmentId = department1.getId();
+                    break;
+                }
+            }
+//            Long departmentId = departmentManager.getDepartmentIdByCode((String) parentInfo.get("parentCode"));
             if (StringUtils.isEmpty(departmentId)||departmentId.equals(-1L)){
                 returnMap.put("status",2);
                 returnMap.put("errcode","SYNC_ERR_2_1_0004");
@@ -478,8 +493,18 @@ public class ThirdparyServlet extends HttpServlet {
         Map<String,Object> syncContent = (Map<String, Object>) map.get("syncContent");
         Map<String,Object> newContent = (Map<String, Object>) syncContent.get("newContent");
         Map<String,Object> baseInfo = (Map<String, Object>) newContent.get("baseInfo");
-        Long deptId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
-        V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(deptId);
+//        Long deptId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
+        List<V3xOrgDepartment> departments = orgManagerDirect.getAllDepartments(null,null,true,null,null,null);
+        Long deptId = -1L;
+        V3xOrgDepartment orgDepartment = null;
+        for (V3xOrgDepartment department : departments) {
+            if (department.getCode().equals((String) baseInfo.get("deptUniCode"))) {
+                orgDepartment = department;
+                deptId = department.getId();
+                break;
+            }
+        }
+//        V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(deptId);
         if (orgDepartment == null) {
             returnMap.put("status", 2);
             returnMap.put("errcode", "SYNC_ERR_1_2_0002");
@@ -539,8 +564,18 @@ public class ThirdparyServlet extends HttpServlet {
             returnMap.put("errormsg","必填属性未填");
             return;
         }
-        Long deptId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
-        V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(deptId);
+        List<V3xOrgDepartment> departments = orgManagerDirect.getAllDepartments(null,null,true,null,null,null);
+        Long deptId = -1L;
+        V3xOrgDepartment orgDepartment = null;
+        for (V3xOrgDepartment department : departments) {
+            if (department.getCode().equals((String) baseInfo.get("deptUniCode"))) {
+                deptId = department.getId();
+                orgDepartment = department;
+                break;
+            }
+        }
+//        Long deptId = departmentManager.getDepartmentIdByCode((String) baseInfo.get("deptUniCode"));
+//        V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(deptId);
         if (orgDepartment == null){
             returnMap.put("status",2);
             returnMap.put("errcode","SYNC_ERR_1_4_0002");
@@ -548,7 +583,14 @@ public class ThirdparyServlet extends HttpServlet {
             return;
         }
         if (parentInfo.get("isCorp").equals("0")){
-            Long departmentId = departmentManager.getDepartmentIdByCode((String) parentInfo.get("parentCode"));
+            Long departmentId = -1L;
+            for (V3xOrgDepartment department : departments) {
+                if (department.getCode().equals((String) parentInfo.get("parentCode"))) {
+                    departmentId = department.getId();
+                    break;
+                }
+            }
+//            Long departmentId = departmentManager.getDepartmentIdByCode((String) parentInfo.get("parentCode"));
             if (StringUtils.isEmpty(departmentId)||departmentId.equals(-1L)){
                 returnMap.put("status",2);
                 returnMap.put("errcode","SYNC_ERR_1_4_0004");
@@ -607,8 +649,17 @@ public class ThirdparyServlet extends HttpServlet {
         Long departmentId = null;
         if (parentInfo.get("isCorp").equals("0")){   //父级是部门
             String departmentCode = (String) parentInfo.get("parentCode");  //部门编码
-            departmentId = departmentManager.getDepartmentIdByCode(departmentCode);
-            V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(departmentId);
+            List<V3xOrgDepartment> departments = orgManagerDirect.getAllDepartments(null,null,true,null,null,null);
+            V3xOrgDepartment orgDepartment = null;
+            for (V3xOrgDepartment department : departments) {
+                if (department.getCode().equals(departmentCode)) {
+                    departmentId = department.getId();
+                    orgDepartment = department;
+                    break;
+                }
+            }
+//            departmentId = departmentManager.getDepartmentIdByCode(departmentCode);
+//            V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(departmentId);
             if (orgDepartment == null){
                 returnMap.put("status",2);
                 returnMap.put("errcode","SYNC_ERR_2_1_0004");
@@ -714,8 +765,17 @@ public class ThirdparyServlet extends HttpServlet {
         Long departmentId = null;
         if (parentInfo.get("isCorp").equals("0")){   //父级是部门
             String departmentCode = (String) parentInfo.get("parentCode");  //部门编码
-            departmentId = departmentManager.getDepartmentIdByCode(departmentCode);
-            V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(departmentId);
+            List<V3xOrgDepartment> departments = orgManagerDirect.getAllDepartments(null,null,true,null,null,null);
+            V3xOrgDepartment orgDepartment = null;
+            for (V3xOrgDepartment department : departments) {
+                if (department.getCode().equals(departmentCode)) {
+                    departmentId = department.getId();
+                    orgDepartment = department;
+                    break;
+                }
+            }
+//            departmentId = departmentManager.getDepartmentIdByCode(departmentCode);
+//            V3xOrgDepartment orgDepartment = orgManager.getDepartmentById(departmentId);
             if (orgDepartment == null){
                 returnMap.put("status",2);
                 returnMap.put("errcode","SYNC_ERR_2_4_0004");
@@ -743,8 +803,12 @@ public class ThirdparyServlet extends HttpServlet {
         member.setName((String) baseInfo.get("userName"));
         member.setProperty("birthday",Datetimes.parse(String.valueOf(baseInfo.get("birthday")), TimeZone.getDefault(), "yyyy-MM-dd"));
         member.setProperty("idnum",(String)baseInfo.get("idCardNumber"));
-        Integer gender = baseInfo.get("gender").equals("Z02") ? 2 : baseInfo.get("gender").equals("Z01") ? 1 : -1;
-        member.setProperty("gender",gender);
+//        Integer gender = baseInfo.get("gender").equals("Z02") ? 2 : baseInfo.get("gender").equals("Z01") ? 1 : -1;
+//        member.setProperty("gender",gender);
+        if (baseInfo.get("gender") != null) {
+            Integer gender = baseInfo.get("gender").equals("Z02") ? 2 : baseInfo.get("gender").equals("Z01") ? 1 : -1;
+            member.setProperty("gender",gender);
+        }
         member.setProperty("telnumber",(String)baseInfo.get("mobile"));
         member.setSortId(Long.parseLong((String) parentInfo.get("showNum")));
         member.setProperty("officenumber",(String)baseInfo.get("telephone"));

src/main/java/com/seeyon/ctp/portal/sso/MySSOLoginHandshake.java

@@ -43,10 +43,12 @@ public class MySSOLoginHandshake extends SSOLoginHandshakeAbstract {
 
         SIDPlugin sid = new SIDPlugin(authServerIp, Integer.parseInt(authServerPort));
         int result = sid.Security_VerifyTicket(authAppCode, ticket);
+//        log.info("ticket:"+ticket);
         if (result == MessageConstants.SECURITY_SERVICE_SUCCESS)
         {
             // 票据验证成功, 获取用户唯一标识
             String passport = sid.getPassport();
+            log.info("ticket:"+ticket);
             log.info("单点登录成功! 用户唯一标识: " + passport);
             return passport;
         }
@@ -62,7 +64,7 @@ public class MySSOLoginHandshake extends SSOLoginHandshakeAbstract {
         }
     }
     public void logoutNotify(String ticket) {
-
+        log.info("退出登录："+ticket);
     }
 
 }
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/apps/collaboration/index.jsp

@@ -14,14 +14,19 @@
 <html class="h100b over_hidden">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title></title>
+    <title>印刷管理</title>
     <script type="text/javascript">
         $(document).ready(function () {
-            <%--alert(${ctp:escapeJavascript(code)})--%>
+            <%--alert("${ctp:escapeJavascript(code)}")--%>
+            <%--alert("${ctp:escapeJavascript(token)}")--%>
+            if ("${ctp:escapeJavascript(token)}" == null || "${ctp:escapeJavascript(token)}" === "")
+                alert("该用户没有权限！");
+            else {
             if ("${ctp:escapeJavascript(code)}" === "erp")
-            window.location.href="http://192.168.3.49/login-validate?appCode=oasystem&uniTicket=${ctp:escapeJavascript(token)}";
+                window.location.href="http://192.168.3.49/login-validate?appCode=oasystem&uniTicket=${ctp:escapeJavascript(token)}";
             if ("${ctp:escapeJavascript(code)}" === "doc")
                 window.location.href="http://192.168.3.49/login-validate?appCode=oasystem&uniTicket=${ctp:escapeJavascript(token)}";
+            }
         });
 
     </script>

src/main/webapp/WEB-INF/jsp/apps/collaboration/stateDetail.jsp

@@ -89,7 +89,7 @@
                     if (txt === 2)
                         return '协商';
                     if (txt === 3)
-                        return '停止';
+                        return '作废';
                     if (txt === 4)
                         return '停止';
                     if (txt === 5)