Commit 54c1c5fc authored by gaoyingwei's avatar gaoyingwei

update:新增一个系统到OA

parent 6cd9d9b6
...@@ -3989,12 +3989,16 @@ public class CollaborationController extends BaseController { ...@@ -3989,12 +3989,16 @@ public class CollaborationController extends BaseController {
String erpAppCode = p.getProperty("erpAppCode"); String erpAppCode = p.getProperty("erpAppCode");
//数字文档的统一认证编码 //数字文档的统一认证编码
String docAppCode = p.getProperty("docAppCode"); String docAppCode = p.getProperty("docAppCode");
//数字文档的统一认证编码
String edmsAppCode = p.getProperty("edmsAppCode");
//获取权限url //获取权限url
String getQXUrl = p.getProperty("getQXUrl"); String getQXUrl = p.getProperty("getQXUrl");
// String userAuthorizedApps = ""; // String userAuthorizedApps = "";
User user = AppContext.getCurrentUser(); User user = AppContext.getCurrentUser();
//用户登录后的权限 //用户登录后的权限
LOG.info("userName:"+user.getLoginName()+" /-------" + getQXUrl);
String quanXian = getQuanXian(user.getLoginName(), getQXUrl); String quanXian = getQuanXian(user.getLoginName(), getQXUrl);
//获取后判断是否成功 //获取后判断是否成功
if (StringUtils.isBlank(quanXian)) { if (StringUtils.isBlank(quanXian)) {
...@@ -4012,6 +4016,7 @@ public class CollaborationController extends BaseController { ...@@ -4012,6 +4016,7 @@ public class CollaborationController extends BaseController {
} }
boolean isErp = false; boolean isErp = false;
boolean isDoc = false; boolean isDoc = false;
boolean isEdms = false;
if (code.equals("erp")) { if (code.equals("erp")) {
for (String s : list) { for (String s : list) {
if (erpAppCode.equals(s)) { if (erpAppCode.equals(s)) {
...@@ -4031,7 +4036,18 @@ public class CollaborationController extends BaseController { ...@@ -4031,7 +4036,18 @@ public class CollaborationController extends BaseController {
} }
} }
if (!isDoc) { if (!isDoc) {
LOG.info("该用户没有印刷管理权限!"); LOG.info("该用户没有数字文档权限!");
return modelAndView;
}
}else if (code.equals("edms")){
for (String s : list) {
if (edmsAppCode.equals(s)) {
isEdms = true;
break;
}
}
if (!isEdms) {
LOG.info("该用户没有文档管理权限!");
return modelAndView; return modelAndView;
} }
} }
...@@ -4044,6 +4060,9 @@ public class CollaborationController extends BaseController { ...@@ -4044,6 +4060,9 @@ public class CollaborationController extends BaseController {
}else if (code.equals("doc")){ }else if (code.equals("doc")){
//如果存在doc权限,则获取token //如果存在doc权限,则获取token
map = getTicket(getTicketUrl,docAppCode,user.getLoginName()); map = getTicket(getTicketUrl,docAppCode,user.getLoginName());
}else if (code.equals("edms")){
//如果存在doc权限,则获取token
map = getTicket(getTicketUrl,edmsAppCode,user.getLoginName());
} }
if(StringUtils.isNotBlank(map)){ if(StringUtils.isNotBlank(map)){
decodeRs = URLDecoder.decode(map, "UTF-8"); decodeRs = URLDecoder.decode(map, "UTF-8");
...@@ -4078,6 +4097,7 @@ public class CollaborationController extends BaseController { ...@@ -4078,6 +4097,7 @@ public class CollaborationController extends BaseController {
list.set(i, new StringHttpMessageConverter(Charset.forName("utf-8"))); list.set(i, new StringHttpMessageConverter(Charset.forName("utf-8")));
} }
} }
LOG.info("getQuanXianUrl:"+getQuanXianUrl+" /-------" );
String respnose = rest.getForObject(getQuanXianUrl, String.class,map); String respnose = rest.getForObject(getQuanXianUrl, String.class,map);
String code = ""; String code = "";
if(StringUtils.isNotBlank(respnose)){ if(StringUtils.isNotBlank(respnose)){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment